diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-10-16 11:53:36 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-10-16 11:53:36 +0300 |
| commit | 9b5ecebffcb0b6037f3668803b176071d9c9e699 (patch) | |
| tree | a24730a7aaf83898b08d08f5c3699e536014ff11 /indra/newview | |
| parent | 98529440c6d64067a9c807fec39eeb1ac0652f30 (diff) | |
MAINT-3231 FIXED Show first run dialog only for Desura viewer
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 506eba0683..d5f8a1e46e 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -786,16 +786,19 @@ bool idle_startup() display_startup(); LLPanelLogin::giveFocus(); - /* MAINT-3231 Don't show first run dialog - if (gSavedSettings.getBOOL("FirstLoginThisInstall")) + // MAINT-3231 Show first run dialog only for Desura viewer + if (gSavedSettings.getString("sourceid") == "1208_desura") { - LL_INFOS("AppInit") << "FirstLoginThisInstall, calling show_first_run_dialog()" << LL_ENDL; - show_first_run_dialog(); + if (gSavedSettings.getBOOL("FirstLoginThisInstall")) + { + LL_INFOS("AppInit") << "FirstLoginThisInstall, calling show_first_run_dialog()" << LL_ENDL; + show_first_run_dialog(); + } + else + { + LL_DEBUGS("AppInit") << "FirstLoginThisInstall off" << LL_ENDL; + } } - else - { - LL_DEBUGS("AppInit") << "FirstLoginThisInstall off" << LL_ENDL; - }*/ LLStartUp::setStartupState( STATE_LOGIN_WAIT ); // Wait for user input } |