From 2188da26bea8eff0538498c4e6caa69be53d6bbc Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 27 Oct 2015 12:27:53 +0200
Subject: MAINT-5760 FIXED Favorites sort order reverts every session and no
favorites display at the login screen for single name "Resident" accounts.
---
indra/newview/llstartup.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
(limited to 'indra')
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())
--
cgit v1.2.3