diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-13 08:57:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-13 08:57:53 -0400 |
| commit | b7635b6112b7c7fd448aa4400bba2edbf15a5b0a (patch) | |
| tree | 71a591c69a0bae36666e96f9ff23dcc563cbb193 /indra/llcommon | |
| parent | c556efbce8e093883a7c7474b1cdac0d53c39cfb (diff) | |
| parent | 522af96acaf07e098e8ce4a3eb9187a5eaeda6d7 (diff) | |
pull transplanted crash fix changesets back from viewer-release
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llavatarname.cpp | 10 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
2 files changed, 7 insertions, 5 deletions
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; } diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 15e3ffe1da..3838b2b16c 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 5; -const S32 LL_VERSION_PATCH = 2; +const S32 LL_VERSION_PATCH = 3; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |