From b74dc0e27a09fef55d12e5ea0e22a13ec9ca24e8 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Tue, 14 Dec 2021 09:07:09 -0800
Subject: [PATCH] SL-16388 Viewer MFA fix Duplicate Listener crash when first
token challenge failed
also cleaned up some xui warnings
---
indra/newview/lllogininstance.cpp | 3 ++-
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 f19569d4292..902510c2949 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 361641d313d..7fd31cd9e29 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
--
GitLab