summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Kittenbrink <brad@lindenlab.com>2022-03-08 17:29:45 -0800
committerBrad Kittenbrink <brad@lindenlab.com>2022-03-08 17:41:50 -0800
commit87b494f585f14d6ecc8dbe2d0ce26ab79b62ce30 (patch)
tree5ab1801024d0eef5e5fbda74237d8142d89c4b92 /indra/newview
parent89ab1e4525445d5efc370c381f7c1e18faab8f16 (diff)
Oops, forgot the other half of SL-16825 fix. need to check both "RememberUser" and "RememberPassword" settings
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llstartup.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index d625ef2539..64e6042047 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -3617,7 +3617,9 @@ bool process_login_success_response()
LLViewerMedia::getInstance()->openIDSetup(openid_url, openid_token);
}
- if(response.has("mfa_hash") && gSavedSettings.getBOOL("RememberUser"))
+
+ // Only save mfa_hash for future logins if the user wants their info remembered.
+ if(response.has("mfa_hash") && gSavedSettings.getBOOL("RememberUser") && gSavedSettings.getBOOL("RememberPassword"))
{
LLPointer<LLSecAPIHandler> basic_secure_store = getSecHandler(BASIC_SECHANDLER);
std::string grid(LLGridManager::getInstance()->getGridId());