diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:52:52 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:52:52 -0500 |
| commit | 0f72f152e88efd7fc56cf6764f25bd2d0d4bf062 (patch) | |
| tree | 7681f51b585d19910fa749dc4dbbc0ab4abe63fd /indra/newview/llimview.cpp | |
| parent | daae74e569c0f0bc4ea822ac4127c1d8c21aa91f (diff) | |
| parent | 1630bd4149cc8637f01eea82e4497dbf0d76b777 (diff) | |
merge fix for STORM-616
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() |