summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-11 10:42:38 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-11 10:42:38 +0100
commitee1bede01d5ecb8c018a8083456ee85542d4616f (patch)
tree7f2dd7aabe79e360bcdd97df6b1d10dfac294925 /indra/newview/skins/default/xui
parent24f54d1dff50fa7d01202f224e4b6aadcaf46887 (diff)
parentb46ba199fffbcbf70a42b28d2fa6b72d38d77771 (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/menu_participant_list.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 6a90e92eca..f126431263 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -160,34 +160,34 @@
parameter="can_moderate_voice" />
</menu_item_call>
<menu_item_call
- label="Mute everyone else"
+ label="Unmute this participant"
layout="topleft"
- name="ModerateVoiceMuteOthers">
+ name="ModerateVoiceUnMuteSelected">
<on_click
function="ParticipantList.ModerateVoice"
- parameter="others" />
+ parameter="selected" />
<on_enable
function="ParticipantList.EnableItem.Moderate"
parameter="can_moderate_voice" />
</menu_item_call>
<menu_item_call
- label="Unmute this participant"
+ label="Mute everyone"
layout="topleft"
- name="ModerateVoiceUnMuteSelected">
+ name="ModerateVoiceMute">
<on_click
function="ParticipantList.ModerateVoice"
- parameter="selected" />
+ parameter="mute_all" />
<on_enable
function="ParticipantList.EnableItem.Moderate"
parameter="can_moderate_voice" />
</menu_item_call>
<menu_item_call
- label="Unmute everyone else"
+ label="Unmute everyone"
layout="topleft"
- name="ModerateVoiceUnMuteOthers">
+ name="ModerateVoiceUnmute">
<on_click
function="ParticipantList.ModerateVoice"
- parameter="others" />
+ parameter="unmute_all" />
<on_enable
function="ParticipantList.EnableItem.Moderate"
parameter="can_moderate_voice" />