diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-07 14:31:09 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-07 14:31:09 -0800 |
| commit | be9bae601cfba3a94dfdcce4a6770cbb328681b6 (patch) | |
| tree | d73855436cfd1a9649d9a8bfb8d24106bbefcbc8 | |
| parent | 1ec800fb443101947623019e838d51bd603d21c2 (diff) | |
| parent | 561e0504742149bf1c4df96a74edd94309659675 (diff) | |
STORM-1045 : pull into viewer-development
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llcommon/llavatarname.cpp | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 161f6c5454..c02c6dba1f 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -156,6 +156,7 @@ Ann Congrejo CT-193 Ardy Lay VWR-19499 + VWR-24917 Argent Stonecutter VWR-68 Armin Weatherwax diff --git a/indra/llcommon/llavatarname.cpp b/indra/llcommon/llavatarname.cpp index ad1845d387..ba3dd6d6b4 100644 --- a/indra/llcommon/llavatarname.cpp +++ b/indra/llcommon/llavatarname.cpp @@ -90,14 +90,16 @@ void LLAvatarName::fromLLSD(const LLSD& sd) std::string LLAvatarName::getCompleteName() const { std::string name; - if (!mUsername.empty()) + if (mUsername.empty() || mIsDisplayNameDefault) + // If the display name feature is off + // OR this particular display name is defaulted (i.e. based on user name), + // then display only the easier to read instance of the person's name. { - name = mDisplayName + " (" + mUsername + ")"; + name = mDisplayName; } else { - // ...display names are off, legacy name is in mDisplayName - name = mDisplayName; + name = mDisplayName + " (" + mUsername + ")"; } return name; } |