summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-10-15 13:32:31 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-10-15 13:32:31 -0700
commitb0fd7bf7ea85ad9f0249a887e7a592e01c6eabb7 (patch)
tree762690bdfe497eb5af636ef9f3fc71884896ce04 /indra/newview/llimview.cpp
parent508686047d5e98934d5fefbb576e54f108df6fe3 (diff)
fixing ims not logging with display names off
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r--indra/newview/llimview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 5dd03783ad..c865dcf9a3 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -526,7 +526,8 @@ bool LLIMModel::LLIMSession::isOtherParticipantAvaline()
void LLIMModel::LLIMSession::onAvatarNameCache(const LLUUID& avatar_id, const LLAvatarName& av_name)
{
- mHistoryFileName = av_name.mUsername;
+ // if username is empty, display names isn't enabled, use the display name
+ mHistoryFileName = av_name.mUsername.empty() ? av_name.mDisplayName : av_name.mUsername;
}
void LLIMModel::LLIMSession::buildHistoryFileName()