summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-10-25 10:31:47 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-10-25 10:31:47 -0700
commite98eff02ae4894050267a6b302c4887393ff1244 (patch)
tree501b472f462fb6c3f2aee750ad726e7d9c4c7504 /indra/newview
parentcb5d8d1a9295076327f23e5f6d6c91fd0d4580ea (diff)
DN-181 Chat & IM logs saved in unreadable .llsd instead of .txt - fixing saving of p2p logs
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llimview.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index ba0dc31005..349ef8185f 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -527,9 +527,10 @@ bool LLIMModel::LLIMSession::isOtherParticipantAvaline()
void LLIMModel::LLIMSession::onAvatarNameCache(const LLUUID& avatar_id, const LLAvatarName& av_name)
{
- if (av_name.getLegacyName().empty())
+ if (av_name.mLegacyFirstName.empty())
{
- // if display names is off the legacy name will be the display name
+ // 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