From 87b6a05ba628f5d4351263e449d6fef72d51e993 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 16 Mar 2018 19:17:44 +0200 Subject: MAINT-8372 Fixed doubled error messages --- indra/newview/lllogininstance.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/lllogininstance.cpp') diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index 8d361d3161..bc93fa2c20 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -269,6 +269,10 @@ bool LLLoginInstance::handleLoginEvent(const LLSD& event) void LLLoginInstance::handleLoginFailure(const LLSD& event) { + // TODO: we are handling failure in two separate places - + // here and in STATE_LOGIN_PROCESS_RESPONSE processing + // consider uniting them. + // Login has failed. // Figure out why and respond... LLSD response = event["data"]; @@ -339,6 +343,8 @@ void LLLoginInstance::handleLoginFailure(const LLSD& event) else if( reason_response == "key" || reason_response == "presence" || reason_response == "connect" + || !message_response.empty() // will be handled in STATE_LOGIN_PROCESS_RESPONSE + || !response["message_id"].asString().empty() ) { // these are events that have already been communicated elsewhere -- cgit v1.2.3