From 545b03da7110b9b37f0275bb34e8089f10770e0d Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 22 Sep 2017 15:33:33 -0400
Subject: [PATCH] MAINT-7827: suppress doubled notices on various login
problems
---
indra/newview/lllogininstance.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index bb55a3a6c01..242a845abe2 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -330,10 +330,12 @@ void LLLoginInstance::handleLoginFailure(const LLSD& event)
data["VERSION"] = required_version;
LLNotificationsUtil::add("RequiredUpdate", data, LLSD::emptyMap(), boost::bind(&LLLoginInstance::handleLoginDisallowed, this, _1, _2));
}
- else if(reason_response == "key")
+ else if( reason_response == "key"
+ || reason_response == "presence"
+ || reason_response == "connect"
+ )
{
- // this is a password problem or other restriction
- // an appropriate message has already been displayed
+ // these are events that have already been communicated elsewhere
attemptComplete();
}
else
--
GitLab