diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:51:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:51:12 -0500 |
| commit | 1630bd4149cc8637f01eea82e4497dbf0d76b777 (patch) | |
| tree | 6c06b7a5a33217d23e752e9336f024e082aeecee /indra/newview/llimview.cpp | |
| parent | f0a0831954475a2f49fe7473046f0ba657fb2405 (diff) | |
| parent | bf5e9b8374c905b795339ca6426034e237ed5378 (diff) | |
merge fix for STORM-560
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index cc48226052..3578c98622 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -537,7 +537,15 @@ bool LLIMModel::LLIMSession::isOtherParticipantAvaline() void LLIMModel::LLIMSession::onAvatarNameCache(const LLUUID& avatar_id, const LLAvatarName& av_name) { - mHistoryFileName = av_name.mUsername; + if (av_name.mUsername.empty()) + { + // display names is off, use mDisplayName which will be the legacy name + mHistoryFileName = LLCacheName::buildUsername(av_name.mDisplayName); + } + else + { + mHistoryFileName = av_name.mUsername; + } } void LLIMModel::LLIMSession::buildHistoryFileName() |