diff options
author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-06-23 12:47:54 +0300 |
---|---|---|
committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-06-23 12:47:54 +0300 |
commit | 3e0f31f406d4376fd9cd59b306fda5775ea5c4e6 (patch) | |
tree | 6765c3aa0566d60bca89b0e4a72d3590ea5316a0 /indra/newview/llstartup.cpp | |
parent | e998f1427ff1cd0fbdfb7f69b39720e19ec0a7d0 (diff) |
MAINT-5001 FIXED Logging in and then quickly logging out removes stored favorite login locations
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rwxr-xr-x | indra/newview/llstartup.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index c012537e78..ca22f1f17b 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3218,6 +3218,23 @@ bool process_login_success_response() LLStringUtil::trim(gDisplayName); } } + std::string first_name; + if(response.has("first_name")) + { + first_name = response["first_name"].asString(); + LLStringUtil::replaceChar(first_name, '"', ' '); + LLStringUtil::trim(first_name); + gAgentUsername = first_name; + } + + if(response.has("last_name") && !gAgentUsername.empty() && (gAgentUsername != "Resident")) + { + std::string last_name = response["last_name"].asString(); + LLStringUtil::replaceChar(last_name, '"', ' '); + LLStringUtil::trim(last_name); + gAgentUsername = gAgentUsername + " " + last_name; + } + if(gDisplayName.empty()) { if(response.has("first_name")) @@ -3238,6 +3255,7 @@ bool process_login_success_response() gDisplayName += text; } } + if(gDisplayName.empty()) { gDisplayName.assign(gUserCredential->asString()); |