diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2017-07-24 17:48:55 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2017-07-24 17:48:55 +0300 |
| commit | f9b6b0f50d94c5a8838a00ce4b4013b2a0dead06 (patch) | |
| tree | a0ef7759ca9043bac5089c6eb93ca3d3b49e3a86 /indra/newview | |
| parent | 5d812b95e8fe600ba3fc4c15f6e06fd5b888f21a (diff) | |
MAINT-7629 FIXED Crash in LLSpeakerMgr::findSpeaker(LLUUID const &)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 10 |
1 files 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; |