diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-18 06:30:40 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-18 06:30:40 +0200 |
| commit | 1ffa0ce510620c81df03e7c9a2ff6fedb7ce0241 (patch) | |
| tree | cd44f24b31303dc76543f6e9ce8a33ffab984a8e /indra/newview/llfloaterimcontainer.h | |
| parent | 8ea1f4a3fc77145cb60a7b8182e0da9c0e43ed69 (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
Merge branch 'main' into DRTVWR-599-maint-Z
Diffstat (limited to 'indra/newview/llfloaterimcontainer.h')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h index b4a9d377ab..82f3b00ebc 100644 --- a/indra/newview/llfloaterimcontainer.h +++ b/indra/newview/llfloaterimcontainer.h @@ -106,7 +106,7 @@ public: LLConversationViewModel& getRootViewModel() { return mConversationViewModel; } LLUUID getSelectedSession() { return mSelectedSession; } void setSelectedSession(LLUUID sessionID) { mSelectedSession = sessionID; } - LLConversationItem* getSessionModel(const LLUUID& session_id) { return get_ptr_in_map(mConversationsItems,session_id); } + LLConversationItem* getSessionModel(const LLUUID& session_id); LLConversationSort& getSortOrder() { return mConversationViewModel.getSorter(); } // Handling of lists of participants is public so to be common with llfloatersessiontab |