diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-03-17 14:19:42 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-03-17 14:19:42 -0700 |
| commit | f232096bba9280dd78ef378612eeb65ae2814307 (patch) | |
| tree | 17da0d7b1bd17771691c461919bbba5f1780e905 /indra/newview/llstartup.cpp | |
| parent | 4c225e3fc7b92e68a25efdb1ca8927e266e84ae5 (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 52130c2c83..49c2208f34 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -786,6 +786,9 @@ bool idle_startup() display_startup(); LLPanelLogin::giveFocus(); + // MAINT-3231 Show first run dialog only for Desura viewer + if (gSavedSettings.getString("sourceid") == "1208_desura") + { if (gSavedSettings.getBOOL("FirstLoginThisInstall")) { LL_INFOS("AppInit") << "FirstLoginThisInstall, calling show_first_run_dialog()" << LL_ENDL; @@ -795,6 +798,7 @@ bool idle_startup() { LL_DEBUGS("AppInit") << "FirstLoginThisInstall off" << LL_ENDL; } + } LLStartUp::setStartupState( STATE_LOGIN_WAIT ); // Wait for user input } |