diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:40:42 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:40:42 -0500 |
| commit | 7f48809a74cde8b78894178fe2e284e7213a805a (patch) | |
| tree | 51d37e2dee5b083c6aafb09d5a41b7055e966ab9 /indra/newview/llimview.cpp | |
| parent | 7aa12f01171cab4dd69aaa0fd1062f434b9b47d6 (diff) | |
| parent | 1139584b026db86fd20364d0eb21b6e2351f8fb1 (diff) | |
merge fix for STORM-189
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() |