From c8726aba303bcf1207b730a344536e25491420bc Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 10 Nov 2015 09:48:56 -0500
Subject: remove execute permission from many files that should not have it

---
 indra/newview/skins/default/xui/en/menu_object_icon.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 indra/newview/skins/default/xui/en/menu_object_icon.xml

(limited to 'indra/newview/skins/default/xui/en/menu_object_icon.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 1241558dbf7e21a39487c16f940aed1db689ef84 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Wed, 20 Apr 2016 19:40:19 +0300
Subject: MAINT-2129 "Block" button doesn't become disabled in remote object
 inspector after object has been added to block list

---
 indra/newview/skins/default/xui/en/menu_object_icon.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/menu_object_icon.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml
index 2d4f1792c2..93093014eb 100755
--- a/indra/newview/skins/default/xui/en/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_object_icon.xml
@@ -23,6 +23,9 @@
         <menu_item_call.on_click
          function="ObjectIcon.Action"
          parameter="block" />
+        <menu_item_call.on_enable
+         function="ObjectIcon.Enable"
+         parameter="is_blocked" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft" />
-- 
cgit v1.2.3


From efa716b5fcaa0f0faa4003e072747898a223e983 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Wed, 18 May 2016 19:29:31 +0300
Subject: MAINT-2129 "Block" button doesn't become disabled

---
 indra/newview/skins/default/xui/en/menu_object_icon.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/menu_object_icon.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml
index 93093014eb..5137aea72a 100644
--- a/indra/newview/skins/default/xui/en/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_object_icon.xml
@@ -23,8 +23,19 @@
         <menu_item_call.on_click
          function="ObjectIcon.Action"
          parameter="block" />
-        <menu_item_call.on_enable
-         function="ObjectIcon.Enable"
+        <menu_item_call.on_visible
+         function="ObjectIcon.Visible"
+         parameter="not_blocked" />
+    </menu_item_call>
+    <menu_item_call
+     label="Unblock"
+     layout="topleft"
+     name="Unblock">
+        <menu_item_call.on_click
+         function="ObjectIcon.Action"
+         parameter="unblock" />
+        <menu_item_call.on_visible
+         function="ObjectIcon.Visible"
          parameter="is_blocked" />
     </menu_item_call>
     <menu_item_separator
-- 
cgit v1.2.3