From 5713e41e5728d61a9f5e8bdace7124fb4701953a Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 1 Oct 2013 12:32:57 +0300 Subject: MAINT-3231 FIXED Don't show first run dialog. --- indra/newview/llstartup.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llstartup.cpp') diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 67a76460a7..506eba0683 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -786,6 +786,7 @@ bool idle_startup() display_startup(); LLPanelLogin::giveFocus(); + /* MAINT-3231 Don't show first run dialog if (gSavedSettings.getBOOL("FirstLoginThisInstall")) { LL_INFOS("AppInit") << "FirstLoginThisInstall, calling show_first_run_dialog()" << LL_ENDL; @@ -794,7 +795,7 @@ bool idle_startup() else { LL_DEBUGS("AppInit") << "FirstLoginThisInstall off" << LL_ENDL; - } + }*/ LLStartUp::setStartupState( STATE_LOGIN_WAIT ); // Wait for user input } -- cgit v1.2.3 From 9b5ecebffcb0b6037f3668803b176071d9c9e699 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Wed, 16 Oct 2013 11:53:36 +0300 Subject: MAINT-3231 FIXED Show first run dialog only for Desura viewer --- indra/newview/llstartup.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'indra/newview/llstartup.cpp') 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 } -- cgit v1.2.3