From d886d89f53267d9a9a02c775fcb16e667278b904 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Thu, 1 Nov 2012 15:00:50 +0200 Subject: CHUI-446 FIXED Checkm mParent before using dynamic_cast --- indra/newview/llconversationmodel.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index 33631a027b..47a82bfe17 100644 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -428,14 +428,16 @@ void LLConversationItemParticipant::onAvatarNameCache(const LLAvatarName& av_nam mName = (av_name.mUsername.empty() ? av_name.mDisplayName : av_name.mUsername); mDisplayName = (av_name.mDisplayName.empty() ? av_name.mUsername : av_name.mDisplayName); mNeedsRefresh = true; - LLConversationItemSession* parent_session = dynamic_cast(mParent); - if (parent_session != NULL) + if(mParent != NULL) { - parent_session->requestSort(); - parent_session->updateParticipantName(this); - postEvent("update_participant", parent_session, this); + LLConversationItemSession* parent_session = dynamic_cast(mParent); + if (parent_session != NULL) + { + parent_session->requestSort(); + parent_session->updateParticipantName(this); + postEvent("update_participant", parent_session, this); + } } - } void LLConversationItemParticipant::dumpDebugData() -- cgit v1.2.3