MAINT-8372 Fixed doubled error messages

Fri, 16 Mar 2018 19:17:44 +0200

author
andreykproductengine <andreykproductengine@lindenlab.com>
date
Fri, 16 Mar 2018 19:17:44 +0200
changeset 55346
d1b2f4143da9
parent 55345
203d3d3dc054
child 55347
23e1b0dc0faf

MAINT-8372 Fixed doubled error messages

indra/newview/lllogininstance.cpp file | annotate | diff | revisions
indra/newview/llstartup.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/lllogininstance.cpp	Fri Mar 16 18:04:48 2018 +0200
     1.2 +++ b/indra/newview/lllogininstance.cpp	Fri Mar 16 19:17:44 2018 +0200
     1.3 @@ -269,6 +269,10 @@
     1.4  
     1.5  void LLLoginInstance::handleLoginFailure(const LLSD& event)
     1.6  {
     1.7 +    // TODO: we are handling failure in two separate places -
     1.8 +    // here and in STATE_LOGIN_PROCESS_RESPONSE processing
     1.9 +    // consider uniting them.
    1.10 +
    1.11      // Login has failed. 
    1.12      // Figure out why and respond...
    1.13      LLSD response = event["data"];
    1.14 @@ -339,6 +343,8 @@
    1.15      else if(   reason_response == "key"
    1.16              || reason_response == "presence"
    1.17              || reason_response == "connect"
    1.18 +            || !message_response.empty() // will be handled in STATE_LOGIN_PROCESS_RESPONSE
    1.19 +            || !response["message_id"].asString().empty()
    1.20              )
    1.21      {
    1.22          // these are events that have already been communicated elsewhere
     2.1 --- a/indra/newview/llstartup.cpp	Fri Mar 16 18:04:48 2018 +0200
     2.2 +++ b/indra/newview/llstartup.cpp	Fri Mar 16 19:17:44 2018 +0200
     2.3 @@ -1154,7 +1154,7 @@
     2.4  
     2.5  						}
     2.6  					}
     2.7 -					else 
     2.8 +					else if (!message.empty())
     2.9  					{
    2.10  						// This wasn't a certificate error, so throw up the normal
    2.11  						// notificatioin message.

mercurial