diff --git a/.hgtags b/.hgtags
index f122124a39a184d7f719528178cc7abff5744eb6..4bb6691a4d166a9bf38b9e24317d65d67f308a4f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -75,3 +75,5 @@ b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-release
63a6aedfce785a6c760377bf685b2dae616797d2 2.5.1-start
4dede9ae1ec74d41f6887719f6f1de7340d8578d 2.5.1-release
4dede9ae1ec74d41f6887719f6f1de7340d8578d DRTVWR-37_2.5.1-release
+b53a0576eec80614d7767ed72b40ed67aeff27c9 DRTVWR-38_2.5.2-release
+b53a0576eec80614d7767ed72b40ed67aeff27c9 2.5.2-release
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 3323828d4fd331133646a3a4072459bdf10ae1d0..89d533da282b55cf5bc1181f6d90e0b8649095b5 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 73190a05cac7c18c70295130edf6b74dbfedec80..7a328ee4dac3f56a8a8effa445442869a26135cf 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2,7 +2,7 @@
<floater
legacy_header_height="18"
follows="left|top|right"
- height="780"
+ height="580"
layout="topleft"
bg_opaque_image="Window_NoTitle_Foreground"
bg_alpha_image="Window_NoTitle_Background"
@@ -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"
@@ -1336,8 +1340,9 @@ even though the user gets a free copy.
<!-- Object tab -->
<panel
border="false"
- follows="all"
+ follows="left|top|right|bottom"
height="567"
+ bg_color="Red"
label="Object"
layout="topleft"
left_delta="0"
@@ -1349,6 +1354,32 @@ even though the user gets a free copy.
<panel.string name="None">None</panel.string>
<panel.string name="Prim">Prim</panel.string>
<panel.string name="Convex Hull">Convex Hull</panel.string>
+ <scroll_container
+ border="false"
+ bg_color="FrogGreen"
+ follows="left|top|right|bottom"
+ height="567"
+ label="Object"
+ layout="topleft"
+ left_delta="0"
+ mouse_opaque="false"
+ help_topic="toolbox_object_tab"
+ name="Object_Scroll"
+ top="16"
+ width="295">
+ <panel
+ border="false"
+ follows="left|top_right|bottom"
+ height="567"
+ bg_color="Yellow"
+ label="Object Scroll"
+ layout="topleft"
+ left_delta="0"
+ mouse_opaque="false"
+ help_topic="toolbox_object_tab"
+ name="Object Scroll"
+ top="16"
+ width="295">
<check_box
height="19"
label="Locked"
@@ -1590,7 +1621,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 +1631,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 +1646,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 +1661,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 +1676,7 @@ even though the user gets a free copy.
min_val="0"
name="Physics Restitution"
top_pad="4"
- width="128" />
+ width="132" />
@@ -2232,6 +2263,8 @@ even though the user gets a free copy.
value="Mesh" />
</combo_box>
</panel>
+ </scroll_container>
+ </panel>
<panel
border="false"
follows="all"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 38e91656136780b1db888c8a1187e2ed0191457b..8655a6bf97489edcab54281c7ef5c93af3778900 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 7e89860c608a7918b288b8750444a255c2d623a9..774a9e8bbf9a14abe466cc5cb3ee230d9e82b9fc 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"