From c437c3b5b50fa05727435a37c37f79c34428d2a7 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Thu, 19 Jan 2012 20:34:31 +0200 Subject: 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. --- indra/llcommon/llavatarname.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/llcommon/llavatarname.cpp') 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; -- cgit v1.2.3