summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-10-27 13:55:34 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-10-27 13:55:34 +0200
commit9e6f193cd6b9b767679d810de8f2b45a7cd91540 (patch)
tree08aec1021f64968fa2a88da391111c01ad4adcb1 /indra
parent7f39e2583ffffee5866663ebf8798f393fc67570 (diff)
MAINT-5760 FIXED Favorites sort order reverts every session and no favorites display at the login screen for single name "Resident" accounts.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llstartup.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 965aad517d..8a027fdbfa 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -3245,12 +3245,15 @@ bool process_login_success_response()
gAgentUsername = first_name;
}
- if(response.has("last_name") && !gAgentUsername.empty() && (gAgentUsername != "Resident"))
+ if(response.has("last_name") && !gAgentUsername.empty())
{
std::string last_name = response["last_name"].asString();
- LLStringUtil::replaceChar(last_name, '"', ' ');
- LLStringUtil::trim(last_name);
- gAgentUsername = gAgentUsername + " " + last_name;
+ if (last_name != "Resident")
+ {
+ LLStringUtil::replaceChar(last_name, '"', ' ');
+ LLStringUtil::trim(last_name);
+ gAgentUsername = gAgentUsername + " " + last_name;
+ }
}
if(gDisplayName.empty())