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 | 548b372af2cf871541e2d3ceb2ca84bd670dc27b (patch) | |
| tree | c7c2c42ba3b86275fc24126d9cbb3ad82fd5e8d4 /indra | |
| parent | ac83e82008cb19f2fd5532dea4dc4b556bd0dd6e (diff) | |
MAINT-7629 FIXED Crash in LLSpeakerMgr::findSpeaker(LLUUID const &)
Diffstat (limited to 'indra')
| -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; |