merge

1 files changed, 9 insertions, 7 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 53cc808e70..0b241a9796 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -757,7 +757,7 @@
      follows="left|top"
      halign="right"
      layout="topleft"
-     right="-100"
+     right="-120"
      name="linked_set_count"
      top="144"
      width="80">
@@ -772,7 +772,7 @@
      halign="right"
      layout="topleft"
 	 top_delta="0"
-     right="-10"
+     right="-8"
      name="linked_set_cost"
      tool_tip="Cost of currently selected linked sets as [prims],[physics complexity]" 
      width="80">
@@ -786,7 +786,7 @@
      halign="right"
      layout="topleft"
      top_pad="5"
-     right="-100"
+     right="-120"
      name="object_count"
      width="80">
         Objects: [COUNT]
@@ -799,7 +799,7 @@
      halign="right"
      layout="topleft"
 	 top_delta="0"
-     right="-10"
+     right="-8"
      name="object_cost"
      tool_tip="Cost of currently selected objects as [prims] / [physics complexity]"
      width="80">
@@ -843,7 +843,8 @@
      tab_height="25"
      top="173"
      width="295">
-	<panel
+	
+<panel
 	 border="false"
 	 follows="all"
 	 label="General"
@@ -1537,17 +1538,18 @@ even though the user gets a free copy.
              layout="topleft"
              left_delta="0"
              name="label physicsshapetype"
-             top_pad="10"
+             top_pad="50"
              width="121">
                 Physics Shape Type:
             </text>
 			<combo_box
 			   height="23"
+			   top_delta="-5" 
 			   layout="topleft"
 			   follows="left|top"
 			   name="Physics Shape Type Combo Ctrl"
 			   tool_tip="Choose the physics shape type"
-			   left_pad="0"
+			   left_pad="5"
 			   width="108"/>
 
             <spinner