diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-30 18:50:37 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-30 18:50:37 +0200 |
| commit | 1160d82fb8566d7c76f0c39785c97fcf31768f0c (patch) | |
| tree | 5f3b9c28b1e277ee7d339bf54ee11d27250e655b /indra/newview/llconversationmodel.cpp | |
| parent | d2087bdd8a6591cafc6c8d8de7582a9dda6ea352 (diff) | |
| parent | 5215bf6edef283cb6c570d3e7aea11f0ecf8313f (diff) | |
merging into latest changes
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
| -rw-r--r-- | indra/newview/llconversationmodel.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index f0c8658cfe..67a1aed675 100644 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -401,12 +401,13 @@ void LLConversationItemParticipant::onAvatarNameCache(const LLAvatarName& av_nam mDisplayName = (av_name.mDisplayName.empty() ? av_name.mUsername : av_name.mDisplayName); mNeedsRefresh = true; LLConversationItemSession* parent_session = dynamic_cast<LLConversationItemSession*>(mParent); - if (parent_session) + if (parent_session != NULL) { parent_session->requestSort(); parent_session->updateParticipantName(this); + postEvent("update_participant", parent_session, this); } - postEvent("update_participant", parent_session, this); + } void LLConversationItemParticipant::dumpDebugData() |