diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-12-15 18:28:43 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-12-15 18:28:43 +0800 |
| commit | 91b49c8bfa061f3d3b8601d5398b1889a9e31850 (patch) | |
| tree | 98adc151491a2bee51a70cf7dd37de21d4f32bb3 /indra/newview/llfloaterimcontainer.h | |
| parent | 0cce0b8149e049161ab17f1c608ded2d6cc12b0e (diff) | |
| parent | a80e3fe4191aee87c566937953d52fa6498b7f32 (diff) | |
Merge tag '7.1.1-release'
source for viewer 7.1.1.7039128750
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 |