summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-11-08 22:28:45 +0800
committerErik Kundiman <erik@megapahit.org>2024-11-08 22:28:45 +0800
commit5574363f0d2b6316e7628358357b329b78b6e409 (patch)
tree7ae54c8d338b0e9b82d5109ee9182785d1605f8c /indra/newview/llconversationmodel.cpp
parentcadde1312df01d4e5939e05816cb011a8e14d5b1 (diff)
Nearby session being first is a non default option
which can be set on the leftmost drop-down menu of the conversations floater.
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
-rw-r--r--indra/newview/llconversationmodel.cpp5
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)
{