summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authormaxim@mnikolenko <maxim@mnikolenko>2012-12-05 20:03:15 +0200
committermaxim@mnikolenko <maxim@mnikolenko>2012-12-05 20:03:15 +0200
commite0b1b063c14081a7c53ab5620db20385e1f2bbbd (patch)
tree339c81ecc82badfa87bc658c9bda56448d9eb0a1 /indra/newview/skins/default
parentfe09598fbecdf8620eba8ac1a46b3062bcb6191a (diff)
CHUI-577 FIXED "Mute text" and "Block voice" items are added to context menu instead of "Block\unblock"
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/menu_conversation.xml11
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 908b2c174f..e8265fe482 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -105,14 +105,21 @@
<on_enable function="Avatar.EnableItem" parameter="can_pay" />
</menu_item_call>
<menu_item_check
- label="Block / unblock"
+ label="Block Voice"
layout="topleft"
name="block_unblock">
<on_click function="Avatar.DoToSelected" parameter="block_unblock" />
<on_check function="Avatar.CheckItem" parameter="is_blocked" />
<on_enable function="Avatar.EnableItem" parameter="can_block" />
</menu_item_check>
- <menu_item_call
+ <menu_item_check
+ label="Block Text"
+ layout="topleft"
+ name="MuteText">
+ <on_click function="Avatar.DoToSelected" parameter="mute_unmute"/>
+ <on_check function="Avatar.CheckItem" parameter="is_muted" />
+ <on_enable function="Avatar.EnableItem" parameter="can_block" />
+ <menu_item_call
label="Group Profile"
layout="topleft"
name="group_profile">