diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-13 18:22:43 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-13 18:22:43 +0200 |
| commit | 0bba892bb0b146a2c20597d8cfe6eb0353c17f06 (patch) | |
| tree | 15d3ad979533feb32114589a5fd4f79e4aa8a5ae /indra/newview/llconversationview.cpp | |
| parent | dfc406f0ff4e03e36c3d877c9bd57d2c18e08d43 (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llfloaterfixedenvironment.cpp
Diffstat (limited to 'indra/newview/llconversationview.cpp')
| -rw-r--r-- | indra/newview/llconversationview.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 0ca4679ea4..25971a7d52 100644 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -431,7 +431,7 @@ void LLConversationViewSession::refresh() // Refresh the session view from its model data LLConversationItem* vmi = dynamic_cast<LLConversationItem*>(getViewModelItem()); vmi->resetRefresh(); - + if (mSessionTitle) { if (!highlightFriendTitle(vmi)) @@ -567,7 +567,9 @@ BOOL LLConversationViewParticipant::postBuild() } updateChildren(); - return LLFolderViewItem::postBuild(); + LLFolderViewItem::postBuild(); + refresh(); + return TRUE; } void LLConversationViewParticipant::draw() @@ -648,7 +650,7 @@ void LLConversationViewParticipant::refresh() // *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(); } |