Mesh-development work in progress

2 files changed, 33 insertions, 4 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index ef4cf15938..7a328ee4da 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"
@@ -1340,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"
@@ -1353,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"
@@ -1619,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"
@@ -2236,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/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"