summaryrefslogtreecommitdiff
path: root/indra/newview/llloginhandler.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-05-04 17:16:12 -0400
committerNat Goodspeed <nat@lindenlab.com>2017-05-04 17:16:12 -0400
commita4467e9ffe9dc378451d7bb6b8c70f6c0c42a814 (patch)
treec6a918a0a3a0d7e1117ca71bfc966e3d6cd4b5ea /indra/newview/llloginhandler.cpp
parent1f2fcc12980dd21659bce493431b7a1b3fe2ef00 (diff)
parent07ec10781e45b3d92e27e92ddad39cf74fa7ff0b (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-c-11
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);
}