1 files changed, 91 insertions, 52 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
index ae198d69a3..b9649e9c57 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -3,9 +3,9 @@
  can_resize="true"
  can_minimize="true"
  can_close="false"
- height="275"
+ height="270"
  layout="topleft"
- min_height="100"
+ min_height="122"
  min_width="190"
  name="floater_voice_controls"
  help_topic="floater_voice_controls"
@@ -33,23 +33,27 @@
      name="no_one_near">
         No one near has voice enabled
     </string>
-      <layout_stack
-         clip="false"
-         follows="all"
-         height="262"
+    <string
+     name="max_visible_items">
+        5
+    </string>
+    <panel
+     bevel_style="out"
+     border="true"
+     follows="left|right|top"
+     height="62"
+     layout="topleft"
+     left="0"
+     name="control_panel"
+     top="0"
+     width="282">
+        <panel
+         height="18"
+         follows="top|left|right"
          layout="topleft"
          left="10"
-         mouse_opaque="false"
-         name="my_call_stack"
-         orientation="vertical"
+         name="my_panel"
          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"
@@ -75,57 +79,92 @@
             <output_monitor
              auto_update="true"
              draw_border="false"
-             follows="top|right"
+             follows="right"
              height="16"
              layout="topleft"
              name="speaking_indicator"
-             left_pad="5"
+             right="-1"
+             top="2"
              visible="true"
              width="20" />
-        </layout_panel>
+        </panel>
+        <layout_stack
+         border_size="0"
+         clip="false"
+         follows="all"
+         height="28"
+         layout="topleft"
+         left="10"
+         mouse_opaque="false"
+         name="leave_call_stack"
+         orientation="horizontal"
+         top_pad="5"
+         width="263">
+         <layout_panel
+          auto_resize="true"
+          follows="left|right"
+          height="26"
+          layout="topleft"
+          min_height="23"
+          min_width="5"
+          mouse_opaque="false"
+          name="left_anchor"
+          width="80"/>
          <layout_panel
           auto_resize="false"
-          user_resize="false" 
-          follows="top|left"
+          follows="left|right"
           height="26"
-          visible="true"
           layout="topleft"
+          mouse_opaque="false"
+          min_height="24"
+          min_width="100"
           name="leave_call_btn_panel"
           width="100">
            <button
-          follows="right|top"
-            height="23"
-            top_pad="0"
+            follows="left|right"
+            height="24"
             label="Leave Call"
+            left="0"
             name="leave_call_btn"
+            top="0"
             width="100" />
          </layout_panel>
-      <layout_panel
-          follows="all"
-          layout="topleft"
-          left="2"
-          top_pad="0"
-          height="205" 
-          name="callers_panel"
-          user_resize="false" 
-          width="280">
-        <avatar_list
-         follows="all"
-         height="205"
-         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_panel
+         auto_resize="true"
+         follows="left|right"
+         height="26"
          layout="topleft"
-         left="0"
-         name="non_avatar_caller"
-         top="10"
-         width="276" />
-      </layout_panel>
-    </layout_stack>
+         mouse_opaque="false"
+         min_height="24"
+         min_width="5"
+         name="right_anchor"
+         width="80"/>
+        </layout_stack>
+    </panel>
+    <avatar_list
+     follows="all"
+     height="197"
+     ignore_online_status="true"
+     layout="topleft"
+     left="0"
+     multi_select="true"
+     name="speakers_list"
+     width="282" />
+    <panel
+     filename="panel_avatar_list_item.xml"
+     follows="left|right|top"
+     height="24"
+     layout="topleft"
+     left="0"
+     name="non_avatar_caller"
+     top="70"
+     width="282" />
+    <view_border
+     bevel_style="out"
+     follows="left|top|right|bottom"
+     height="206"
+     layout="topleft"
+     left="0"
+     top="63"
+     width="282" />
 </floater>