Automated merge up from viewer 2.0 trunk.

Some llvoiceclient changes duplicated changes that had already been
made in the voice modularization refactor, so the refactor versions
were used.

1 files changed, 9 insertions, 8 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
index 6c54532a3a..28a6995186 100644
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -4,7 +4,7 @@
  follows="all"
  height="215"
  name="panel_im_control_panel"
- width="180">
+ width="150">
     <layout_stack
      mouse_opaque="false"
      border_size="0"
@@ -16,15 +16,16 @@
      name="vertical_stack"
      orientation="vertical"
      top="0"
-     width="177">
+     width="147">
         <layout_panel
          auto_resize="true"
          follows="top|left"
          height="130"
          layout="topleft"
+         left="0"
          min_height="0"
          mouse_opaque="false"
-         width="180"
+         width="147"
          top="0"
          name="speakers_list_panel"
          user_resize="false">
@@ -39,7 +40,7 @@
              show_info_btn="false"
              show_profile_btn="false"
              show_speaking_indicator="false"
-             width="180" />
+             width="147" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -47,7 +48,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="160"
+         width="130"
          name="call_btn_panel"
          user_resize="false"
          visible="false">
@@ -56,7 +57,7 @@
              height="20"
              label="Call"
              name="call_btn"
-             width="160"
+             width="130"
              top="5" />
         </layout_panel>
         <layout_panel
@@ -65,7 +66,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="160"
+         width="130"
          name="end_call_btn_panel"
          user_resize="false"
          visible="false">
@@ -82,7 +83,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="160"
+         width="130"
          name="voice_ctrls_btn_panel"
          user_resize="false"
          visible="false">