diff options
author | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
---|---|---|
committer | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
commit | 1b0e3d68183fb63ac5c160bc9aa7956746f33faf (patch) | |
tree | 260f0972726dc9d8957486f2e03773dac4a10afc /indra/newview/llconversationview.cpp | |
parent | 7772ed0cb2ebf81d4e6b1a35dcffdfe88f6c1bcc (diff) | |
parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) |
Merge branch 'master' into DRTVWR-531
Diffstat (limited to 'indra/newview/llconversationview.cpp')
-rw-r--r-- | indra/newview/llconversationview.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index df16868132..65cec68884 100644 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -696,10 +696,13 @@ void LLConversationViewParticipant::refresh() { // Refresh the participant view from its model data LLConversationItemParticipant* participant_model = dynamic_cast<LLConversationItemParticipant*>(getViewModelItem()); - participant_model->resetRefresh(); - - // *TODO: We should also do something with vmi->isModerator() to echo that state in the UI somewhat - mSpeakingIndicator->setIsModeratorMuted(participant_model->isModeratorMuted()); + if (participant_model) + { + participant_model->resetRefresh(); + + // *TODO: We should also do something with vmi->isModerator() to echo that state in the UI somewhat + mSpeakingIndicator->setIsModeratorMuted(participant_model->isModeratorMuted()); + } // Do the regular upstream refresh LLFolderViewItem::refresh(); |