summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/menu_conversation.xml
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-08-12 20:35:17 -0700
committerMerov Linden <merov@lindenlab.com>2014-08-12 20:35:17 -0700
commit30972fca1d1048a1dbfcb28d58489cd687820ec0 (patch)
tree6291a9f0435024c8f60729c1d11d4b4698e98f96 /indra/newview/skins/default/xui/en/menu_conversation.xml
parent231572cfed6d178658bc3333eb97aff34746cb81 (diff)
parent1346949e4d601e8c945fa30593ba1d405e9ed80d (diff)
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_conversation.xml')
-rwxr-xr-xindra/newview/skins/default/xui/en/menu_conversation.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 31b1d091ee..ed362b36e5 100755
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -17,6 +17,7 @@
layout="topleft"
name="open_voice_conversation">
<on_click function="Avatar.DoToSelected" parameter="open_voice_conversation"/>
+ <on_enable function="Avatar.EnableItem" parameter="can_open_voice_conversation"/>
</menu_item_call>
<menu_item_call
label="Disconnect from voice"
@@ -213,4 +214,12 @@
<on_enable function="Avatar.EnableItem" parameter="can_moderate_voice" />
</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="Avatar.DoToSelected" parameter="ban_member" />
+ <on_enable function="Avatar.EnableItem" parameter="can_ban_member" />
+ </menu_item_call>
</toggleable_menu>