From 9027f4430ddd9817f40b59c463d81a8cc3783c58 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 10 May 2010 10:45:43 +0300
Subject: EXT-7095 FIXED Replaced voice moderation menu items and updated
 related actions. * Replaced "Un/Mute everyone else" menu items with requested
 ones. They are enabled only on participants in Voice session (are shown for
 moderators) * Actions implemented via existent "Un/Mute everyone else"
 functionality where "else" is NULL item.

Known issues:
 * It is impossible to perform the same "Un/Mute everyone" action is session is already in requested state:  EXT-6937
 * If voice is disabled in a group session not all muted participants have appropriate indicator in VCP if resident joins to the session.
    Due to this is the same behavior as before current patch is provided, a separate EXT-7235 bug is filed for this.

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_participant_list.xml     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default')

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" />
-- 
cgit v1.2.3