summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-10-31 09:51:48 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-10-31 09:51:48 -0700
commitcf6ce5453782db38714d9653b14703f8453b4f4d (patch)
treeb3cade671d08959d4c337672c7f672297d11fbde /indra/newview
parent9d9853082361b35987a70574b422c40e8ee04d93 (diff)
parentf9b1b440710668a9979e33c7582d79d14cae8d0d (diff)
merging latest changes
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llconversationmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index f0c8658cfe..74188195f6 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -405,8 +405,8 @@ void LLConversationItemParticipant::onAvatarNameCache(const LLAvatarName& av_nam
{
parent_session->requestSort();
parent_session->updateParticipantName(this);
+ postEvent("update_participant", parent_session, this);
}
- postEvent("update_participant", parent_session, this);
}
void LLConversationItemParticipant::dumpDebugData()