merge

4 files changed, 23 insertions, 19 deletions

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 3323828d4f..89d533da28 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -697,7 +697,7 @@ U32 render_type_from_string(std::string render_type)
 	{
 		return LLPipeline::RENDER_TYPE_AVATAR;
 	}
-	else if ("surfacePath" == render_type)
+	else if ("surfacePatch" == render_type)
 	{
 		return LLPipeline::RENDER_TYPE_TERRAIN;
 	}
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 73190a05ca..a0a370dc12 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"
@@ -1615,7 +1619,7 @@ even though the user gets a free copy.
              min_val="0"
              name="Physics Friction"
              top_pad="4"
-             width="128" />
+             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" />
 
 
 
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 38e9165613..8655a6bf97 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1355,15 +1355,15 @@
                  parameter="character" />
             </menu_item_check>
             <menu_item_check
-             label="SurfacePath"
-             name="SurfacePath"
+             label="Surface Patch"
+             name="Surface Patch"
              shortcut="control|alt|shift|5">
                 <menu_item_check.on_check
                  function="Advanced.CheckRenderType"
-                 parameter="surfacePath" />
+                 parameter="surfacePatch" />
                 <menu_item_check.on_click
                  function="Advanced.ToggleRenderType"
-                 parameter="surfacePath" />
+                 parameter="surfacePatch" />
             </menu_item_check>
             <menu_item_check
              label="Sky"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 7e89860c60..774a9e8bbf 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -191,7 +191,7 @@
      width="310">
         <panel
          bg_alpha_color="DkGray2"
-         follows="left|top|right"
+         follows="left|top|right|bottom"
          height="580"
          layout="topleft"
          left="0"