diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-03-26 22:38:19 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-03-26 22:38:19 +0000 |
| commit | d353c9ae0fe575788f537c72dc9d22834bef8bdb (patch) | |
| tree | daca0c1bc18bd6c7adc907dd8c5e30291b618931 /indra/newview/llconversationview.cpp | |
| parent | 303feae305eb526d75b7d9c8b640407cb8003469 (diff) | |
| parent | 247a3362b8d35541993007a33693186def7f23b0 (diff) | |
Merged in euclid-525 (pull request #499)
Merge recent fixes into LMR#5 RC
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 093e772abe..7c1db98b3f 100644 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -617,10 +617,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(); |