diff options
author | prep <prep@lindenlab.com> | 2013-03-11 14:45:53 -0400 |
---|---|---|
committer | prep <prep@lindenlab.com> | 2013-03-11 14:45:53 -0400 |
commit | 207d9fd767895a3470722fb298eeef4f338e479a (patch) | |
tree | 050b5c2c1d88b910aeebe8c8be04c19f548bb123 /indra/llcommon/llavatarname.cpp | |
parent | 82c92ce5a97d6a83505c775348aef692e18e42ed (diff) | |
parent | fe042430b03667abcd6b72ef9cc27d82d85f4242 (diff) |
Viewer-chui merge
Diffstat (limited to 'indra/llcommon/llavatarname.cpp')
-rw-r--r-- | indra/llcommon/llavatarname.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/llcommon/llavatarname.cpp b/indra/llcommon/llavatarname.cpp index 95ecce509b..642bd82e90 100644 --- a/indra/llcommon/llavatarname.cpp +++ b/indra/llcommon/llavatarname.cpp @@ -178,6 +178,21 @@ std::string LLAvatarName::getCompleteName() const return name; } +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; + name += " "; + name += mLegacyLastName; + return name; +} + std::string LLAvatarName::getDisplayName() const { if (sUseDisplayNames) |