diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2021-12-14 09:07:09 -0800 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2021-12-14 09:07:09 -0800 |
| commit | b74dc0e27a09fef55d12e5ea0e22a13ec9ca24e8 (patch) | |
| tree | 89de0bc375ba0891015dd6dc33725c4696888ba7 | |
| parent | 6d177898a9a5883ad7939be162e51d9a61d0e0b1 (diff) | |
SL-16388 Viewer MFA fix Duplicate Listener crash when first token challenge failed
also cleaned up some xui warnings
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_mfa.xml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index f19569d429..902510c294 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -524,6 +524,8 @@ bool LLLoginInstance::handleTOSResponse(bool accepted, const std::string& key) bool LLLoginInstance::handleMFAResponse(const std::string& token, const std::string& key) { + LLEventPumps::instance().obtain(MFA_REPLY_PUMP).stopListening(MFA_LISTENER_NAME); + if(!token.empty()) { LL_INFOS("LLLogin") << "LLLoginInstance::handleMFAResponse: token submitted" << LL_ENDL; @@ -539,7 +541,6 @@ bool LLLoginInstance::handleMFAResponse(const std::string& token, const std::str attemptComplete(); } - LLEventPumps::instance().obtain(MFA_REPLY_PUMP).stopListening(MFA_LISTENER_NAME); return true; } diff --git a/indra/newview/skins/default/xui/en/floater_mfa.xml b/indra/newview/skins/default/xui/en/floater_mfa.xml index 361641d313..7fd31cd9e2 100644 --- a/indra/newview/skins/default/xui/en/floater_mfa.xml +++ b/indra/newview/skins/default/xui/en/floater_mfa.xml @@ -22,12 +22,10 @@ token prompt </text> <line_editor - allow_text_entry="true" follows="left|top|right" height="19" layout="topleft" bottom_delta="40" - max_chars="16" name="token_edit" width="100" /> <button |