From 4639243be9df5fc9fbca8a5ee0599ba9b43a22e4 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 16 Apr 2014 22:37:33 +0200
Subject: [PATCH] FIRE-13447: RLV shownames restrictions can be circumvented
 via avatar pie/context menu

--HG--
branch : Firestorm_4.6.5
---
 indra/newview/skins/default/xui/en/menu_attachment_other.xml   | 3 +++
 indra/newview/skins/default/xui/en/menu_avatar_other.xml       | 3 +++
 .../newview/skins/default/xui/en/menu_pie_attachment_other.xml | 3 +++
 indra/newview/skins/default/xui/en/menu_pie_avatar_other.xml   | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index bd40b64ab9..a8a923443c 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -28,6 +28,9 @@
 	 name="Add to Set">
 		<menu_item_call.on_click
 		 function="Avatar.AddToContactSet" />
+		<menu_item_call.on_enable
+		 function="RLV.EnableIfNot"
+		 parameter="shownames" />
 	</menu_item_call>
     <menu_item_call
      label="IM"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 6b6ae67223..91be9c619b 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -34,6 +34,9 @@
 	 name="Add to Set">
 		<menu_item_call.on_click
 		 function="Avatar.AddToContactSet" />
+		<menu_item_call.on_enable
+		 function="RLV.EnableIfNot"
+		 parameter="shownames" />
 	</menu_item_call>
     <menu_item_call
      label="IM"
diff --git a/indra/newview/skins/default/xui/en/menu_pie_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_pie_attachment_other.xml
index d24113af1b..3c69ea4d69 100644
--- a/indra/newview/skins/default/xui/en/menu_pie_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_pie_attachment_other.xml
@@ -69,6 +69,9 @@
             name="Add to set">
             <pie_slice.on_click
                 function="Avatar.AddToContactSet" />
+            <pie_slice.on_enable
+                function="RLV.EnableIfNot"
+                parameter="shownames" />
         </pie_slice>
     </pie_menu>
     <pie_slice
diff --git a/indra/newview/skins/default/xui/en/menu_pie_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_pie_avatar_other.xml
index 0dd1d352b9..1dc976544f 100644
--- a/indra/newview/skins/default/xui/en/menu_pie_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_pie_avatar_other.xml
@@ -69,6 +69,9 @@
             name="Add to set">
             <pie_slice.on_click
                 function="Avatar.AddToContactSet" />
+            <pie_slice.on_enable
+                function="RLV.EnableIfNot"
+                parameter="shownames" />
         </pie_slice>
     </pie_menu>
     <pie_slice