summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsessiontab.cpp
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-11-16 18:58:21 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-11-16 18:58:21 +0000
commitf2f7034f2d358886ddb4137a7b5ab3c3f5717a4f (patch)
treef5098b9532f6d7b757b9a8fb345e7aa5e7e69108 /indra/newview/llfloaterimsessiontab.cpp
parente95b7efd0b4469ce18bce3bc0261ecc9be06ea9c (diff)
parent353329c2c2e9e8fa1ff273de2016c9e155585f45 (diff)
Merged in DV546-merge-6.5.1 (pull request #776)
DRTVWR-546 merge up to 6.5.1
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
-rw-r--r--indra/newview/llfloaterimsessiontab.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 7541bb5efe..441979389e 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -518,9 +518,12 @@ void LLFloaterIMSessionTab::addConversationViewParticipant(LLConversationItem* p
LLFolderViewItem* widget = get_ptr_in_map(mConversationsWidgets,uuid);
// If not already present, create the participant view and attach it to the root, otherwise, just refresh it
- if (widget && update_view)
+ if (widget)
{
- updateConversationViewParticipant(uuid); // overkill?
+ if (update_view)
+ {
+ updateConversationViewParticipant(uuid); // overkill?
+ }
}
else
{