diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-01-05 17:22:28 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-01-05 17:22:28 +0200 |
| commit | 349b57248891959d6ffab522d4e56d1f3d08f36a (patch) | |
| tree | 6b3f4e3aba57075273c0e95ce6e25286865ffe67 /indra | |
| parent | 7004dfe75fe597a60063bc7b581dbd7cdbfa2f2d (diff) | |
MAINT-930 Fixed Viewer saves your password whether you want it to or not
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llloginhandler.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llstartup.cpp | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llloginhandler.cpp b/indra/newview/llloginhandler.cpp index 39f3c0f113..eca34c0d4d 100644 --- a/indra/newview/llloginhandler.cpp +++ b/indra/newview/llloginhandler.cpp @@ -168,7 +168,6 @@ LLPointer<LLCredential> LLLoginHandler::loadSavedUserLoginInfo() authenticator["algorithm"] = "md5"; authenticator["secret"] = md5pass; // yuck, we'll fix this with mani's changes. - gSavedSettings.setBOOL("AutoLogin", TRUE); return gSecAPIHandler->createCredential(LLGridManager::getInstance()->getGrid(), identifier, authenticator); } diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index bbbc93e5be..628b419304 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -683,10 +683,17 @@ bool idle_startup() } else if (gSavedSettings.getBOOL("AutoLogin")) { + // Log into last account gRememberPassword = TRUE; gSavedSettings.setBOOL("RememberPassword", TRUE); show_connect_box = false; } + else if (gSavedSettings.getLLSD("UserLoginInfo").size() == 3) + { + // Console provided login&password + gRememberPassword = gSavedSettings.getBOOL("RememberPassword"); + show_connect_box = false; + } else { gRememberPassword = gSavedSettings.getBOOL("RememberPassword"); |