From 9f9b240dcee53a50b56a0ccb8d255a86d0ce62c9 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Tue, 6 Apr 2010 11:39:01 +0100
Subject: Added voice font selection to the voice floater.

---
 .../default/xui/en/floater_voice_controls.xml      | 38 +++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

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 c4411db8c5..100a060557 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -33,6 +33,9 @@
      name="no_one_near">
         No one near has voice enabled
     </string>
+    <floater.string name="no_voice_font">
+        No Voice Effect
+    </floater.string>
       <layout_stack
          clip="false"
          follows="all"
@@ -84,7 +87,39 @@
              visible="true"
              width="20" />
         </layout_panel>
-         <layout_panel
+        <layout_stack
+         clip="false"
+         auto_resize="false"
+         follows="left|right"
+         height="23"
+         layout="topleft"
+         left="10"
+         mouse_opaque="false"
+         name="voice_font_and_leave_call_stack"
+         orientation="horizontal"
+         width="263">
+          <layout_panel
+           auto_resize="false"
+           user_resize="false"
+           follows="top|left"
+           height="26"
+           visible="true"
+           layout="topleft"
+           name="voice_font_panel"
+           width="120">
+            <combo_box
+             follows="left|top"
+             height="23"
+             name="voice_font"
+             top_pad="0"
+             width="120">
+              <combo_box.item
+                label="No Voice Effect"
+                name="no_voice_font"
+                value="0" />
+            </combo_box>
+          </layout_panel>
+        <layout_panel
           auto_resize="false"
           user_resize="false" 
           follows="top|left"
@@ -101,6 +136,7 @@
             name="leave_call_btn"
             width="100" />
          </layout_panel>
+      </layout_stack>
       <layout_panel
           follows="all"
           layout="topleft"
-- 
cgit v1.2.3