diff options
| author | callum_linden <callum@lindenlab.com> | 2017-11-30 14:44:44 -0800 |
|---|---|---|
| committer | callum_linden <callum@lindenlab.com> | 2017-11-30 14:44:44 -0800 |
| commit | dd0d2805e2b495246525f49325c4492b7b57f157 (patch) | |
| tree | 96ae78468bbe760c4934416764a4cd89cf5ae381 /indra/newview/llstartup.cpp | |
| parent | 2e3c5ac88a434ee437bc3e68b321d5bd0bcd7cc9 (diff) | |
| parent | e3a2c5e3217ae74a0277f2e6d4e1e708fe398a1c (diff) | |
Automated erge with tip of viewer64
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index db74689df9..ad9a554ef5 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); } @@ -2766,6 +2766,7 @@ void LLStartUp::postStartupState() stateInfo["str"] = getStartupStateString(); stateInfo["enum"] = gStartupState; sStateWatcher->post(stateInfo); + gDebugInfo["StartupState"] = getStartupStateString(); } |