merge

1 files changed, 9 insertions, 8 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 0129d97616..40a644657a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -174,9 +174,10 @@ Automatic position for:
      label="Opacity"
      layout="topleft"
      left="80"
-     label_width="60"
+     label_width="156"
      name="bubble_chat_opacity"
-     width="200" />
+     top_pad = "10"
+     width="347" />
     <color_swatch
      can_apply_immediately="true"
      color="0 0 0 1"
@@ -184,7 +185,7 @@ Automatic position for:
      follows="left|top"
      height="50"
      layout="topleft"
-     left_pad="10"
+     left_pad="30"
      top="190"
      name="background"
      tool_tip="Choose color for bubble chat"
@@ -202,10 +203,10 @@ Automatic position for:
    follows="left|top"
    height="12"
    layout="topleft"
-   left="30"
+   left="80"
    name="UI Size:"
-   top_pad="5"
-   width="300">
+   top_pad="25"
+   width="160">
     UI size
   </text>
   <slider
@@ -216,7 +217,7 @@ Automatic position for:
    increment="0.025"
    initial_value="1"
    layout="topleft"
-   left_delta="52"
+   left_pad="0"
    max_val="1.4"
    min_val="0.75"
    name="ui_scale_slider"
@@ -314,7 +315,7 @@ Automatic position for:
  label="Other Devices"
  left="30"
  name="joystick_setup_button"
- top_pad="12"
+ top="27"
  width="155">
     <button.commit_callback
      function="Floater.Show"