diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-07-09 23:37:52 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-09 23:37:52 +0000 |
| commit | fbf1d2a6110a19fd164f6c27a748ce27731b938d (patch) | |
| tree | b0c2e7d44863d212ef9ab58803f705462e0d9653 /indra/newview/llfloaterimsessiontab.h | |
| parent | 97a33b8322ee5c38b13424f8ae3c840f4ffec76f (diff) | |
| parent | 8edcb5bf89de420ffd42a24cb1fb22c86e1c7571 (diff) | |
Merged in euclid-pull_to_LMR4-13397-13443 (pull request #192)
Pull MAINT fixes for SL-13397 and SL-13443 into LMR#4 branch
Approved-by: Andrey Kleshchev
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.h')
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h index 1b4922fd73..5357a14ab9 100644 --- a/indra/newview/llfloaterimsessiontab.h +++ b/indra/newview/llfloaterimsessiontab.h @@ -84,7 +84,7 @@ public: /*virtual*/ void setFocus(BOOL focus); // Handle the left hand participant list widgets - void addConversationViewParticipant(LLConversationItem* item); + void addConversationViewParticipant(LLConversationItem* item, bool update_view = true); void removeConversationViewParticipant(const LLUUID& participant_id); void updateConversationViewParticipant(const LLUUID& participant_id); void refreshConversation(); |