summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-12-07 18:58:52 -0800
committerMerov Linden <merov@lindenlab.com>2012-12-07 18:58:52 -0800
commita6f1690128b510977cfe86071f80f81967b9d0c7 (patch)
treef856510c10ab175959fd4f9ad7f9ae6f84438467 /indra/newview
parentbb322a1cccd3fab28951ad4e11b5edcfc4e48140 (diff)
CHUI-580, CHUI-406 : Fixed : Finished avatar name caching, also fixed the display of (waiting) when names don't come (mostly in legacy mode).
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llconversationmodel.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index 1f6022decb..99dd35a9e8 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -393,6 +393,7 @@ LLConversationItemParticipant::LLConversationItemParticipant(std::string display
mDistToAgent(-1.0),
mAvatarNameCacheConnection()
{
+ mDisplayName = display_name;
mConvType = CONV_PARTICIPANT;
}