Merge remote-tracking branch 'secondlife/release/26.4' into 26.4

1 files changed, 28 insertions, 0 deletions

diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 5ac4ce0d52..2e8fb752b8 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -35,8 +35,10 @@
 #include "llcommandhandler.h"
 #include "llfloaterreg.h"
 #include "lllocalcliprect.h"
+#include "llpanelblockedlist.h"
 #include "lltrans.h"
 #include "llfloaterimnearbychat.h"
+#include "llfloaterreporter.h"
 #include "llfloaterworldmap.h"
 #include "llviewermenu.h"
 
@@ -93,6 +95,32 @@ public:
             }
             return true;
         }
+        if (verb == "block")
+        {
+            if (params.size() > 2)
+            {
+                const std::string object_name = LLURI::unescape(params[2].asString());
+                LLMute mute(object_id, object_name, LLMute::OBJECT);
+                LLMuteList::getInstance()->add(mute);
+                LLPanelBlockedList::showPanelAndSelect(mute.mID);
+            }
+            return true;
+        }
+        if (verb == "unblock")
+        {
+            if (params.size() > 2)
+            {
+                const std::string object_name = params[2].asString();
+                LLMute mute(object_id, object_name, LLMute::OBJECT);
+                LLMuteList::getInstance()->remove(mute);
+            }
+            return true;
+        }
+        if (verb == "reportAbuse" && web == NULL)
+        {
+            LLFloaterReporter::showFromObject(object_id, LLUUID::null);
+            return true;
+        }
 
         return false;
     }