diff options
| author | Ardy Lay <none@none> | 2011-02-17 20:59:33 -0600 |
|---|---|---|
| committer | Ardy Lay <none@none> | 2011-02-17 20:59:33 -0600 |
| commit | 561e0504742149bf1c4df96a74edd94309659675 (patch) | |
| tree | 4e8184c3cfbb64a59b0e62fee092dea367ee5b0d | |
| parent | 5cb2d63979f0ff72cb9351dc9aa070b1990a1f9c (diff) | |
VWR-24917 Use mIsDisplayNameDefault to reduce name redundancy in nearby chat history
* Clean up changes based upon feedback from reviewers.
* Improve comment based upon feedback from reviewers.
| -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 26d9b98b95..a13a039797 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; } |