Automated merge with ssh://lis@hg.lindenlab.com/james/gooey

1 files changed, 10 insertions, 19 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 102a53ad90..d8e3f4ccfb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -348,23 +348,24 @@
    label="Input/Output devices"
    layout="topleft"
    left="30"
-   top="270"
+   top="262"
    name="device_settings_btn"
    width="190">
   </button>
     <panel
-     background_visible="true"
+     background_visible="false"
      bg_alpha_color="DkGray"
      visiblity_control="ShowDeviceSettings"
      border="false"
      follows="top|left"
-     height="145"
+     height="120"
      label="Device Settings"
      layout="topleft"
      left="0"
      name="device_settings_panel"
      class="panel_voice_device_settings"
-     width="501">
+     width="501"
+     top="285">
       <panel.string
         name="default_text">
         Default
@@ -397,7 +398,7 @@
      left="165"
      max_chars="128"
      name="voice_input_device"
-     top_pad="0"
+     top_pad="-2"
      width="200" />
    <text
      type="string"
@@ -407,7 +408,7 @@
      layout="topleft"
      left="165"
      name="My volume label"
-     top_pad="10"
+     top_pad="5"
      width="200">
         My volume:
     </text>
@@ -422,7 +423,7 @@
      max_val="2"
      name="mic_volume_slider"
      tool_tip="Change the volume using this slider"
-     top_pad="0"
+     top_pad="-2"
      width="220" />
     <text
      type="string"
@@ -442,7 +443,7 @@
      layout="topleft"
      left_delta="0"
      name="bar0"
-     top_delta="5"
+     top_delta="0"
      width="20" />
     <locate
      height="20"
@@ -472,16 +473,6 @@
      name="bar4"
      top_delta="0"
      width="20" />
-  <!--  <text
-     type="string"
-     height="37"
-     left="30"
-     name="voice_intro_text1"
-     top_pad="-4"
-     width="410"
-     word_wrap="true">
-        Adjust the slider to control how loud you sound to other people. To test your volume, simply speak into your microphone
-    </text>-->
           <icon
              height="18"
              image_name="Parcel_Voice_Light"
@@ -510,7 +501,7 @@
      left="165"
      max_chars="128"
      name="voice_output_device"
-     top_pad="0"
+     top_pad="-2"
      width="200" />
     </panel>
     </panel>