From e72c120e9eb1691abdcf0a3c6e650be68a15b6bb Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 17 May 2017 22:34:50 +0300
Subject: MAINT-6805 Fixed Right-click menus in the right and left panes of the
 Conversations windows are different

---
 .../skins/default/xui/en/menu_avatar_icon.xml      | 44 ++++++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
index 410caa7290..05ab4d35a0 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu
+<toggleable_menu
  height="101"
  layout="topleft"
  left="100"
@@ -109,5 +109,43 @@
      name="Mute Text">
        <on_click function="AvatarIcon.Action" parameter="mute_unmute" />
        <on_check function="AvatarIcon.Check" parameter="is_muted" />   
-  </menu_item_check>
-</menu>
+    </menu_item_check>
+    <menu_item_separator layout="topleft" name="Moderator Options Separator"/>
+    <context_menu
+     label="Moderator Options"
+     layout="topleft"
+     name="Moderator Options">
+      <menu_item_check
+       label="Allow text chat"
+       layout="topleft"
+       name="AllowTextChat">
+        <on_check function="AvatarIcon.Check" parameter="is_allowed_text_chat" />
+        <on_click function="AvatarIcon.Action" parameter="toggle_allow_text_chat" />
+        <on_enable function="AvatarIcon.Enable" parameter="can_allow_text_chat" />
+      </menu_item_check>
+      <menu_item_call
+       label="Mute this participant"
+       layout="topleft"
+       name="ModerateVoiceMuteSelected">
+        <on_click function="AvatarIcon.Action" parameter="group_mute" />
+        <on_enable function="AvatarIcon.Enable" parameter="can_mute" />
+        <on_visible function="AvatarIcon.Visible" parameter="show_mute" />
+      </menu_item_call>
+      <menu_item_call
+       label="Unmute this participant"
+       layout="topleft"
+       name="ModerateVoiceUnMuteSelected">
+        <on_click function="AvatarIcon.Action" parameter="group_unmute" />
+        <on_enable function="AvatarIcon.Enable" parameter="can_unmute" />
+        <on_visible function="AvatarIcon.Visible" parameter="show_unmute" />
+      </menu_item_call>
+    </context_menu>
+    <menu_item_separator layout="topleft" name="Group Ban Separator"/>
+    <menu_item_call
+     label="Ban member"
+     layout="topleft"
+     name="BanMember">
+      <on_click function="AvatarIcon.Action" parameter="ban_member" />
+      <on_enable function="AvatarIcon.Enable" parameter="can_ban_member" />
+    </menu_item_call>
+</toggleable_menu>
-- 
cgit v1.2.3