livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-5760 FIXED Favorites sort order reverts every session and no favorites display at the login screen for single name "Resident" accounts.

master
Mnikolenko ProductEngine 2015-10-27 12:27:53 +02:00
parent 7f39e2583f
commit 2188da26be
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llstartup.cpp
View File

@ -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())