From f9b6b0f50d94c5a8838a00ce4b4013b2a0dead06 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Mon, 24 Jul 2017 17:48:55 +0300 Subject: MAINT-7629 FIXED Crash in LLSpeakerMgr::findSpeaker(LLUUID const &) --- indra/newview/llchathistory.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 5748eeec47..a9e8e77a0b 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -452,11 +452,13 @@ public: if (gAgent.isInGroup(mSessionID)) { LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID); - const LLSpeaker * speakerp = speaker_mgr->findSpeaker(getAvatarId()); - - if (NULL != speakerp) + if(speaker_mgr) { - return !speakerp->mModeratorMutedText; + const LLSpeaker * speakerp = speaker_mgr->findSpeaker(getAvatarId()); + if (NULL != speakerp) + { + return !speakerp->mModeratorMutedText; + } } } return false; -- cgit v1.2.3