summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2012-10-30 17:28:39 +0200
committermaxim_productengine <mnikolenko@productengine.com>2012-10-30 17:28:39 +0200
commitc0b1ae6d976a94918ea8adc0908eb7c1e3d11459 (patch)
tree63c2553c6a9ee8b0b052db4a28c907e5896bc5ab /indra/newview
parent1a1a0b91c0c4400ec3febac183124314f9226127 (diff)
CHUI-446 FIXED Check that parent_session is not null
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llconversationmodel.cpp5
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()