summaryrefslogtreecommitdiff
path: root/indra/newview/llloginhandler.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-03-06 14:31:51 -0500
committerOz Linden <oz@lindenlab.com>2017-03-06 14:31:51 -0500
commit61bddc22d97150cd590bc4184355133b6dd3ff87 (patch)
tree59b488c8c4edc51096338fab153d9eaf837d27fe /indra/newview/llloginhandler.cpp
parenta18d4df6c742aa397b70e4dafb41475bd201a558 (diff)
parent08ed7f676f2ce38937a03c2a4e823e3564981264 (diff)
merge changes for 5.0.2-release
Diffstat (limited to 'indra/newview/llloginhandler.cpp')
-rw-r--r--indra/newview/llloginhandler.cpp1
1 files changed, 0 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);
}