diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-10-27 14:07:05 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-10-27 14:07:05 +0200 |
| commit | e74987041f97ea8345dae8b048adfda46670fb78 (patch) | |
| tree | 5b3187d29f82c928ad56a31337013f7ea68f4cf3 /indra/newview | |
| parent | eccafc5c405e7e3727aa5b793ff508f34afd7648 (diff) | |
| parent | 2188da26bea8eff0538498c4e6caa69be53d6bbc (diff) | |
Merged lindenlab/viewer-lion into default
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 11 |
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()) |