diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:28:47 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:28:47 -0500 |
| commit | e08250d0874247c7c2c0acb025602e4299244d83 (patch) | |
| tree | d47e672dcd3d65f0d05cbce3e918f99195c35bb9 /indra/newview/llimview.cpp | |
| parent | b7afbcbc97ed06dd6845d3850633f2eda494940c (diff) | |
| parent | 0cd40b4409b237093a771b28933ac2a33fa9f266 (diff) | |
merge fix for STORM-578
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 857c27be63..cc48226052 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -537,16 +537,7 @@ bool LLIMModel::LLIMSession::isOtherParticipantAvaline() void LLIMModel::LLIMSession::onAvatarNameCache(const LLUUID& avatar_id, const LLAvatarName& av_name) { - if (av_name.mLegacyFirstName.empty()) - { - // if mLegacyFirstName is empty it means display names is off and the - // data came from the gCacheName, mDisplayName will be the legacy name - mHistoryFileName = LLCacheName::cleanFullName(av_name.mDisplayName); - } - else - { - mHistoryFileName = LLCacheName::cleanFullName(av_name.getLegacyName()); - } + mHistoryFileName = av_name.mUsername; } void LLIMModel::LLIMSession::buildHistoryFileName() |