summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2012-01-19 20:34:31 +0200
committerVadim ProductEngine <vsavchuk@productengine.com>2012-01-19 20:34:31 +0200
commitc437c3b5b50fa05727435a37c37f79c34428d2a7 (patch)
tree7bb3084513ee5285810e6cf35946fed57ca3d99d /indra/llcommon
parent19320842ebc39c1b528a2107323f9e918d688177 (diff)
EXP-1815 FIXED Favorites list in login screen not populated when display names are disabled.
* Fixed LLAvatarName::getLegacyName() to work when display names are disabled (it used to return ' ', i.e. empty first and last name separated with a space). * Added some debugging messages.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llavatarname.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/llavatarname.cpp b/indra/llcommon/llavatarname.cpp
index ba3dd6d6b4..3206843bf4 100644
--- a/indra/llcommon/llavatarname.cpp
+++ b/indra/llcommon/llavatarname.cpp
@@ -106,6 +106,11 @@ std::string LLAvatarName::getCompleteName() const
std::string LLAvatarName::getLegacyName() const
{
+ if (mLegacyFirstName.empty() && mLegacyLastName.empty()) // display names disabled?
+ {
+ return mDisplayName;
+ }
+
std::string name;
name.reserve( mLegacyFirstName.size() + 1 + mLegacyLastName.size() );
name = mLegacyFirstName;