Merge branch '26.3'

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/llfloaterconversationlog.cpp b/indra/newview/llfloaterconversationlog.cpp
index 97399c9cf7..40e2d2bf1e 100644
--- a/indra/newview/llfloaterconversationlog.cpp
+++ b/indra/newview/llfloaterconversationlog.cpp
@@ -100,6 +100,10 @@ void LLFloaterConversationLog::onCustomAction (const LLSD& userdata)
     {
         mConversationLogList->toggleSortFriendsOnTop();
     }
+    else if ("show_blocked" == command_name)
+    {
+        gSavedSettings.setBOOL("ShowBlockedConvHistory", !gSavedSettings.getBOOL("ShowBlockedConvHistory"));
+    }
     else if ("view_nearby_chat_history" == command_name)
     {
         LLFloaterReg::showInstance("preview_conversation", LLSD(LLUUID::null), true);
@@ -129,6 +133,10 @@ bool LLFloaterConversationLog::isActionChecked(const LLSD& userdata)
     {
         return gSavedSettings.getBOOL("SortFriendsFirst");
     }
+    else if ("show_blocked" == command_name)
+    {
+        return gSavedSettings.getBOOL("ShowBlockedConvHistory");
+    }
 
     return false;
 }