From d8dd2e7899e678781d4865cd52b2c3f1a7699924 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 28 Sep 2017 16:13:44 +0300 Subject: MAINT-7835 Start location is not changed correctly via 'maps.secondlife.com' link in some cases --- indra/newview/llstartup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llstartup.cpp') diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 8295ce029b..df1d2a3946 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -766,7 +766,7 @@ bool idle_startup() // Show the login dialog login_show(); // connect dialog is already shown, so fill in the names - if (gUserCredential.notNull()) + if (gUserCredential.notNull() && !LLPanelLogin::isCredentialSet()) { LLPanelLogin::setFields( gUserCredential, gRememberPassword); } -- cgit v1.2.3 From f986d1bcbed863ab247080f1b36a64d94e36e8bd Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 7 Nov 2017 19:16:21 +0200 Subject: MAINT-7979 Debug info should contain correct state --- indra/newview/llstartup.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llstartup.cpp') diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index df1d2a3946..89cc66cf33 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2767,6 +2767,7 @@ void LLStartUp::postStartupState() stateInfo["str"] = getStartupStateString(); stateInfo["enum"] = gStartupState; sStateWatcher->post(stateInfo); + gDebugInfo["StartupState"] = getStartupStateString(); } -- cgit v1.2.3