diff options
author | Cho <cho@lindenlab.com> | 2013-02-13 17:58:43 +0000 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2013-02-13 17:58:43 +0000 |
commit | 017f9cad769161ae7ef8fdf509685c36192678ae (patch) | |
tree | d57dd48b2ddb203bc0c2876bd7e93550ed47b73c /indra/newview/skins/default | |
parent | a9f7c0089fe0a94879e5a9ad31cd6f8b5fb51c36 (diff) | |
parent | d818252528aa68a387dc237d1c5a74d366c5a120 (diff) |
merging
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r-- | indra/newview/skins/default/xui/en/menu_conversation.xml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml index 46c6e19fa5..fd5c86b3ca 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml @@ -163,11 +163,20 @@ </menu_item_check> <menu_item_separator layout="topleft" name="moderate_voice_separator" /> <menu_item_call - label="Toggle mute this participant" + label="Mute this participant" layout="topleft" - name="ModerateVoiceToggleMuteSelected"> + name="ModerateVoiceMuteSelected"> <on_click function="Avatar.DoToSelected" parameter="selected" /> - <on_enable function="Avatar.EnableItem" parameter="can_mute_unmute" /> + <on_enable function="Avatar.EnableItem" parameter="can_mute" /> + <on_visible function="Avatar.VisibleItem" parameter="show_mute" /> + </menu_item_call> + <menu_item_call + label="Unmute this participant" + layout="topleft" + name="ModerateVoiceUnMuteSelected"> + <on_click function="Avatar.DoToSelected" parameter="selected" /> + <on_enable function="Avatar.EnableItem" parameter="can_unmute" /> + <on_visible function="Avatar.VisibleItem" parameter="show_unmute" /> </menu_item_call> <menu_item_call label="Mute everyone" |