SH-1087 Edit tools do not fit on default sized viewer window

Work in progress.  Cleaned up some of the XUI layout so that it's properly laid out (e.g. maintains position if the window is resized, even though we don't allow resize)
This checkin should not have any visible UI change effects.

1 files changed, 16 insertions, 12 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 73190a05ca..ef4cf15938 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -295,22 +295,24 @@
 	   width="100">
 	   þ: [COUNT]
 	   </text>
-	<check_box
+    <check_box
      control_name="ScaleUniform"
      height="19"
      label=""
      layout="topleft"
      left="143"
      name="checkbox uniform"
-	 top="50"
+     top="50"
      width="20" />
     <text
      height="19"
      label="Stretch Both Sides"
-     left="163"
+     left_delta="20"
      name="checkbox uniform label"
-     top="55"
+     top_delta="2"
      width="120"
+     layout="topleft"
+     follows="top|left"
      wrap="true">
      	Stretch Both Sides
     </text>
@@ -323,6 +325,7 @@
      left="143"
      name="checkbox stretch textures"
      top_pad="-6"
+     follows="left|top"
      width="134" />
    <check_box
      control_name="SnapEnabled"
@@ -361,9 +364,10 @@
      image_selected="ForwardArrow_Press"
      image_unselected="ForwardArrow_Off"
      layout="topleft"
+     follows="top|left"
      name="Options..."
      tool_tip="See more grid options"
-     top_delta="0"
+     top_pad="-22"
      right="-10"
      width="18"
      height="23" >
@@ -791,10 +795,10 @@
      type="string"
      length="1"
      height="10"
-     follows="left"
+     follows="left|top"
      halign="right"
      layout="topleft"
-	 top_delta="0"
+     top_delta="0"
      right="-8"
      name="linked_set_cost"
      tool_tip="Cost of currently selected linked sets as [prims],[physics complexity]" 
@@ -818,7 +822,7 @@
     text_color="LtGray_50"
      type="string"
      length="1"
-     follows="left"
+     follows="left|top"
      halign="right"
      layout="topleft"
 	 top_delta="0"
@@ -1590,7 +1594,7 @@ even though the user gets a free copy.
              max_val="28"
              name="Physics Gravity"
              top_pad="10"
-             width="128" />
+             width="132" />
 
             <check_box
              height="19"
@@ -1600,7 +1604,7 @@ even though the user gets a free copy.
              name="Physics Material Override"
              tool_tip="Override Material"
              top_pad="10"
-             width="121" />
+             width="132" />
 
             <spinner
              follows="left|top"
@@ -1630,7 +1634,7 @@ even though the user gets a free copy.
              min_val="1"
              name="Physics Density"
              top_pad="4"
-             width="128" />
+             width="132" />
 
             <spinner
              follows="left|top"
@@ -1645,7 +1649,7 @@ even though the user gets a free copy.
              min_val="0"
              name="Physics Restitution"
              top_pad="4"
-             width="128" />
+             width="132" />