livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-16388 Viewer MFA fix Duplicate Listener crash when first token challenge failed 

also cleaned up some xui warnings
master
Brad Kittenbrink 2021-12-14 09:07:09 -08:00
parent 6d177898a9
commit b74dc0e27a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/lllogininstance.cpp
View File

@ -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;
}

2
indra/newview/skins/default/xui/en/floater_mfa.xml
View File

@ -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