Merge branch 'main' into maint-c

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index ed24a8af57..f1d612ba94 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1059,6 +1059,10 @@ void LLFloaterIMContainer::onCustomAction(const LLSD& userdata)
     {
         setSortOrderParticipants(LLConversationFilter::SO_DISTANCE);
     }
+    if ("put_nearby_session_first" == command)
+    {
+        gSavedSettings.setBOOL("IMNearbySessionFirst", !gSavedSettings.getBOOL("IMNearbySessionFirst"));
+    }
     if ("chat_preferences" == command)
     {
         LLFloaterPreference * floater_prefp = LLFloaterReg::showTypedInstance<LLFloaterPreference>("preferences");
@@ -1109,6 +1113,10 @@ bool LLFloaterIMContainer::isActionChecked(const LLSD& userdata)
     {
         return (order.getSortOrderParticipants() == LLConversationFilter::SO_DISTANCE);
     }
+    if ("put_nearby_session_first" == command)
+    {
+        return gSavedSettings.getBOOL("IMNearbySessionFirst");
+    }
     if ("Translating.Enabled" == command)
     {
         return gSavedPerAccountSettings.getBOOL("TranslatingEnabled");