From 651dfe1f6902fe221bcc0306365e4555c118b15b Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 30 Nov 2009 11:43:05 +0200
Subject: Work on major sub-task EXT-2790 (Complete Voice Control Panel
 (floater) started by Lynx (LLVoiceControlPanel))  -- Added initial processing
 of titles for different calls

--HG--
branch : product-engine
---
 .../newview/skins/default/xui/en/floater_voice_controls.xml  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 4434fe7403..4a5642e5c6 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -8,6 +8,18 @@
  save_visibility="true"
  single_instance="true"
  width="282">
+    <string
+     name="title_nearby">
+        NEARBY VOICE
+    </string>
+    <string
+     name="title_group">
+        Group Call with [GROUP]
+    </string>
+    <string
+     name="title_adhoc">
+        Conference Call
+    </string>
     <panel
      bevel_style="in"
      follows="left|right|top"
-- 
cgit v1.2.3


From cbab53ec392fbf3cb1e34324f0a96d04dd084ce6 Mon Sep 17 00:00:00 2001
From: Sergey Borushevsky <sborushevsky@productengine.com>
Date: Mon, 30 Nov 2009 17:47:20 +0200
Subject: Implemented major sub-task EXT-2882 (User who has been muted/unmuted
 by the moderator (that means, user is muted for the whole group) should
 receive a notification.)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 49276172d5..cb0614797a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5783,6 +5783,26 @@ Server Error: Media update or get failed.
          yestext="OK"/>
     </notification>
 
+    <notification
+ icon="alertmodal.tga"
+ name="TextChatIsMutedByModerator"
+ type="alertmodal">
+Your text chat has been muted by moderator.
+        <usetemplate
+         name="okbutton"
+         yestext="OK"/>
+    </notification>
+
+    <notification
+ icon="alertmodal.tga"
+ name="VoiceIsMutedByModerator"
+ type="alertmodal">
+Your voice has been muted by moderator.
+        <usetemplate
+         name="okbutton"
+         yestext="OK"/>
+    </notification>
+
   <notification
    icon="alertmodal.tga"
    name="ConfirmClearTeleportHistory"
-- 
cgit v1.2.3


From 62e775288ca50e37edbdb3dc7dc55dbf61a546e3 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 30 Nov 2009 15:38:18 +0200
Subject: Work on major sub-task EXT-2790 (Complete Voice Control Panel
 (floater) started by Lynx (LLVoiceControlPanel))  -- Changed text for empty
 nearby list to "No one near"

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_voice_controls.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 4a5642e5c6..3c12aed3a0 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -20,6 +20,10 @@
      name="title_adhoc">
         Conference Call
     </string>
+    <string
+     name="no_one_near">
+        No one near
+    </string>
     <panel
      bevel_style="in"
      follows="left|right|top"
-- 
cgit v1.2.3


From a69bef19e1dac71c80cad301ab46414005a9dbf0 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 30 Nov 2009 16:02:22 +0200
Subject: Work on major sub-task EXT-2790 (Complete Voice Control Panel
 (floater) started by Lynx (LLVoiceControlPanel))  -- Enabled "Voice Controls"
 button in P2P voice chat

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_im_control_panel.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 0a5812882d..0a3fd1699f 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -76,7 +76,6 @@
          visible="false"
          width="100" />
         <button
-         enabled="false"
          bottom="10"
          height="20"
          label="Voice Controls"
-- 
cgit v1.2.3


From 4a70a50dad444647d0c9db790d4ce49da1109212 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 30 Nov 2009 18:43:08 +0200
Subject: Work on major sub-task EXT-2790 (Complete Voice Control Panel
 (floater) started by Lynx (LLVoiceControlPanel))  -- initialized agent icon,
 name  -- added agent's speaker indicator

--HG--
branch : product-engine
---
 .../default/xui/en/floater_voice_controls.xml      | 27 ++++++++++++++++------
 1 file changed, 20 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 3c12aed3a0..04696ca2e7 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -27,29 +27,30 @@
     <panel
      bevel_style="in"
      follows="left|right|top"
-     height="73"
+     height="62"
      layout="topleft"
      left="0"
      name="control_panel"
-     width="285">
+     width="282">
         <panel
-         height="20"
+         height="18"
+         follows="top|left|right"
          layout="topleft"
          left="10"
          name="my_panel"
-         width="262">
+         width="263">
             <avatar_icon
              enabled="false"
              follows="left|top"
              height="18"
-             image_name="Generic_Person"
+             default_icon_name="Generic_Person"
              layout="topleft"
              left="0"
              name="user_icon"
              top="0"
              width="18" />
             <text
-             follows="top|left"
+             follows="top|left|right"
              font="SansSerifSmallBold"
              height="16"
              layout="topleft"
@@ -57,8 +58,20 @@
              name="user_text"
              text_color="white"
              top="4"
+             use_ellipses="true" 
              value="Mya Avatar:"
-             width="80" />
+             width="210" />
+            <output_monitor
+             auto_update="true"
+             draw_border="false"
+             follows="right"
+             height="16"
+             layout="topleft"
+             name="speaking_indicator"
+             right="-1"
+             top="2" 
+             visible="true"
+             width="20" />
         </panel>
         <layout_stack
          bottom="10"
-- 
cgit v1.2.3