diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-09-22 15:33:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-09-22 15:33:33 -0400 |
| commit | 545b03da7110b9b37f0275bb34e8089f10770e0d (patch) | |
| tree | f8f61b2d19a4864b2d8e471bf02f8295157ae75e | |
| parent | 02117b8b7b12f47897efc62da8ae525d88733d08 (diff) | |
MAINT-7827: suppress doubled notices on various login problems
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index bb55a3a6c0..242a845abe 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 |