From c73d3073040d7f9731fd94eb51499d90fad6572a Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 18 Mar 2014 11:48:14 +0200
Subject: MAINT-1744 FIXED User cannot unblock an object by selecting "Unblock"
 menu item from object's pop-up menu

---
 indra/newview/lltoolpie.cpp                        | 12 +-----------
 indra/newview/skins/default/xui/en/menu_object.xml | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 1c362c18e0..a09a2739e8 100755
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1671,17 +1671,7 @@ BOOL LLToolPie::handleRightClickPick()
 			{
 				name = node->mName;
 			}
-			std::string mute_msg;
-			if (LLMuteList::getInstance()->isMuted(object->getID(), name))
-			{
-				mute_msg = LLTrans::getString("UnmuteObject");
-			}
-			else
-			{
-				mute_msg = LLTrans::getString("MuteObject2");
-			}
-			
-			gMenuHolder->getChild<LLUICtrl>("Object Mute")->setValue(mute_msg);
+
 			gMenuObject->show(x, y);
 
 			showVisualContextMenuEffect();
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 52ab7da515..5c98a98d3d 100755
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -130,16 +130,23 @@
           function="Object.ReportAbuse" />
       <menu_item_call.on_enable
           function="Object.EnableReportAbuse" />
-    </menu_item_call>
+    </menu_item_call>   
     <menu_item_call
-        enabled="false"
-        label="Block"
-        name="Object Mute">
-      <menu_item_call.on_click
+   		  label="Block"        
+          name="Object Mute">
+        <menu_item_call.on_click
           function="Object.Mute" />
-      <menu_item_call.on_enable
+        <menu_item_call.on_visible
           function="Object.EnableMute" />
     </menu_item_call>
+    <menu_item_call
+          label="Unblock"   
+          name="Object Unmute">
+        <menu_item_call.on_click
+          function="Object.Mute" />
+        <menu_item_call.on_visible
+          function="Object.EnableUnmute" />
+    </menu_item_call>
     <menu_item_call
         enabled="false"
         label="Return"
-- 
cgit v1.2.3