From b84ae2164b641567e443a7c7f9c620887baae700 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Fri, 26 Feb 2010 17:17:21 -0500
Subject: Cleanup pass on environment editor floaters for consistency and to
 eliminate widget overlapping. https://jira.secondlife.com/browse/EXT-4552

---
 .../newview/skins/default/xui/en/floater_water.xml | 109 +++++++++++----------
 1 file changed, 57 insertions(+), 52 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_water.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml
index 32739ac953..3a44ba3763 100644
--- a/indra/newview/skins/default/xui/en/floater_water.xml
+++ b/indra/newview/skins/default/xui/en/floater_water.xml
@@ -16,49 +16,49 @@
      type="string"
      length="1"
      follows="left|top|right"
-     font.style="BOLD"
      height="16"
      layout="topleft"
      left="10"
      name="KeyFramePresetsText"
      top="34"
-     width="110">
+     font="SansSerif"
+     width="85">
         Water Presets:
     </text>
     <combo_box
-     height="18"
+     height="23"
      layout="topleft"
-     left_pad="10"
+     left_delta="95"
      name="WaterPresetsCombo"
-     top_delta="-2"
+     top_delta="-4"
      width="150" />
     <button
-     height="20"
+     height="23"
      label="New"
      label_selected="New"
      layout="topleft"
-     left_pad="20"
+     left_pad="3"
      name="WaterNewPreset"
-     top_delta="1"
-     width="90" />
+     top_delta="0"
+     width="70" />
     <button
-     height="20"
+     height="23"
      label="Save"
      label_selected="Save"
      layout="topleft"
-     left_pad="10"
+     left_pad="3"
      name="WaterSavePreset"
      top_delta="0"
-     width="90" />
+     width="70" />
     <button
-     height="20"
+     height="23"
      label="Delete"
      label_selected="Delete"
      layout="topleft"
-     left_pad="10"
+     left_pad="3"
      name="WaterDeletePreset"
      top_delta="0"
-     width="90" />
+     width="70" />
     <tab_container
     border="false"
      follows="left|top"
@@ -74,7 +74,7 @@
          border="true"
          follows="all"
          height="180"
-         label="Settings"
+         label="SETTINGS"
          layout="topleft"
          left="0"
          mouse_opaque="false"
@@ -331,7 +331,7 @@
          border="true"
          follows="all"
          height="180"
-         label="Image"
+         label="IMAGE"
          layout="topleft"
          left="0"
          mouse_opaque="false"
@@ -348,7 +348,7 @@
              layout="topleft"
              left="10"
              name="BHText"
-             top="10"
+             top="4"
              width="200">
                 Big Wave Direction
             </text>
@@ -361,23 +361,10 @@
              layout="topleft"
              left="10"
              name="WaterWave1DirXText"
-             top_pad="4"
+             top_pad="5"
              width="10">
                 X
             </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="WaterWave1DirYText"
-             top_delta="18"
-             width="10">
-                Y
-            </text>
             <slider
              control_name="WaterWave1DirX"
              decimal_digits="2"
@@ -390,8 +377,22 @@
              max_val="4"
              min_val="-4"
              name="WaterWave1DirX"
-             top="55"
+             left_pad="3"
+             top_pad="6"
              width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="WaterWave1DirYText"
+             top_pad="-15"
+             width="10">
+                Y
+            </text>
             <slider
              control_name="WaterWave1DirY"
              decimal_digits="2"
@@ -404,7 +405,8 @@
              max_val="4"
              min_val="-4"
              name="WaterWave1DirY"
-             top_pad="5"
+             left_pad="3"
+             top_pad="6"
              width="200" />
             <text
              type="string"
@@ -413,9 +415,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-14"
+             left_delta="-13"
              name="BHText2"
-             top_delta="3"
+             top_pad="-10"
              width="355">
                 Little Wave Direction
             </text>
@@ -427,24 +429,12 @@
              height="16"
              layout="topleft"
              left="10"
+             left_delta="0"
              name="WaterWave2DirXText"
-             top="90"
+             top_pad="5"
              width="10">
                 X
             </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="WaterWave2DirYText"
-             top_delta="20"
-             width="10">
-                Y
-            </text>
             <slider
              control_name="WaterWave2DirX"
              decimal_digits="2"
@@ -457,8 +447,22 @@
              max_val="4"
              min_val="-4"
              name="WaterWave2DirX"
-             top="115"
+             left_pad="3"
+             top_pad="6"
              width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="WaterWave2DirYText"
+             top_pad="-15"
+             width="10">
+                Y
+            </text>
             <slider
              control_name="WaterWave2DirY"
              decimal_digits="2"
@@ -471,7 +475,8 @@
              max_val="4"
              min_val="-4"
              name="WaterWave2DirY"
-             top_pad="10"
+             left_pad="3"
+             top_pad="6"
              width="200" />
             <text
              type="string"
-- 
cgit v1.2.3