move base back to default because doing it as a backout was causing merge errors

1 files changed, 132 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
new file mode 100644
index 0000000000..c4411db8c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="true"
+ can_minimize="true"
+ can_close="false"
+ height="202"
+ layout="topleft"
+ min_height="124"
+ min_width="190"
+ name="floater_voice_controls"
+ help_topic="floater_voice_controls"
+ title="Voice Controls"
+ 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>
+    <string
+     name="title_peer_2_peer">
+        Call with [NAME]
+    </string>
+    <string
+     name="no_one_near">
+        No one near has voice enabled
+    </string>
+      <layout_stack
+         clip="false"
+         follows="all"
+         height="189"
+         layout="topleft"
+         left="10"
+         mouse_opaque="false"
+         name="my_call_stack"
+         orientation="vertical"
+         width="263">
+        <layout_panel
+         follows="top|left|right"
+          user_resize="false" 
+         auto_resize="false" 
+         layout="topleft"
+         height="26"
+         name="my_panel">
+            <avatar_icon
+             enabled="false"
+             follows="left|top"
+             height="18"
+             default_icon_name="Generic_Person"
+             layout="topleft"
+             left="5"
+             name="user_icon"
+             top="0"
+             width="18" />
+            <text
+             follows="top|left|right"
+             font="SansSerifSmallBold"
+             height="16"
+             layout="topleft"
+             left_pad="10"
+             name="user_text"
+             text_color="white"
+             top="4"
+             use_ellipses="true"
+             value="Mya Avatar:"
+             width="210" />
+            <output_monitor
+             auto_update="true"
+             draw_border="false"
+             follows="top|right"
+             height="16"
+             layout="topleft"
+             right="-3"
+             name="speaking_indicator"
+             left_pad="5"
+             visible="true"
+             width="20" />
+        </layout_panel>
+         <layout_panel
+          auto_resize="false"
+          user_resize="false" 
+          follows="top|left"
+          height="26"
+          visible="true"
+          layout="topleft"
+          name="leave_call_btn_panel"
+          width="100">
+           <button
+          follows="right|top"
+            height="23"
+            top_pad="0"
+            label="Leave Call"
+            name="leave_call_btn"
+            width="100" />
+         </layout_panel>
+      <layout_panel
+          follows="all"
+          layout="topleft"
+          left="2"
+          top_pad="0"
+          height="132" 
+          name="callers_panel"
+          user_resize="false" 
+          width="280">
+        <avatar_list
+         follows="all"
+         height="132"
+         ignore_online_status="true"
+         layout="topleft"
+         multi_select="true"
+         name="speakers_list"
+         width="280" />
+        <panel
+         filename="panel_avatar_list_item.xml"
+         follows="left|right|top"
+         height="24"
+         layout="topleft"
+         left="0"
+         name="non_avatar_caller"
+         top="10"
+         width="276" />
+      </layout_panel>
+    </layout_stack>
+</floater>