diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-08 22:31:43 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-08 22:31:43 +0800 |
| commit | 0e6a1287e5883aede41f054c7845c17d0508efc8 (patch) | |
| tree | 41e3604e5c3b9598789a451a5a8dbe6a94ab6c77 /indra/newview/llconversationmodel.cpp | |
| parent | 1f1a02f0901694009be469b992fcebeaeea29ebe (diff) | |
| parent | 5574363f0d2b6316e7628358357b329b78b6e409 (diff) | |
Merge branch 'main' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
| -rw-r--r-- | indra/newview/llconversationmodel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index bd29dba6bc..0c939add95 100644 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -726,8 +726,11 @@ bool LLConversationSort::operator()(const LLConversationItem* const& a, const LL { if ((type_a == LLConversationItem::CONV_SESSION_NEARBY) || (type_b == LLConversationItem::CONV_SESSION_NEARBY)) { + if (gSavedSettings.getBOOL("IMNearbySessionFirst")) + return (type_b != LLConversationItem::CONV_SESSION_NEARBY); + else // If one is the nearby session, put nearby session *always* last - return (!(type_b == LLConversationItem::CONV_SESSION_NEARBY)); + return (type_b == LLConversationItem::CONV_SESSION_NEARBY); } else if (sort_order == LLConversationFilter::SO_SESSION_TYPE) { |