diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 21:28:02 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 21:28:02 +0000 |
| commit | d6d2159bf875884bb060aaf8234478dd1ec478b4 (patch) | |
| tree | 6873979584b8d269fb250c35219725598cb9b5d6 /indra/llcommon/llavatarname.cpp | |
| parent | 960139aa6f02f90c6102d3c5d5c38b5ebe689f9c (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
Merge. Pull in viewer-release reflecting new release structure.
Diffstat (limited to 'indra/llcommon/llavatarname.cpp')
| -rwxr-xr-x[-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..100755 --- 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) |