Merge from viewer-experience

29 files changed, 5386 insertions, 3111 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 6a1a600696..a8b3ce9c28 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -139,27 +139,32 @@ Thank you to the following Residents for helping to ensure that this is the best
        word_wrap="true">
 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
 APR Copyright (C) 2000-2004 The Apache Software Foundation
+Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
 cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
 DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
 expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
 FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
 GL Copyright (C) 1999-2004 Brian Paul.
+GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
 google-perftools Copyright (c) 2005, Google Inc.
 Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
 jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
 jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
 ogg/vorbis Copyright (C) 2001, Xiphophorus
 OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+PCRE Copyright (c) 1997-2008 University of Cambridge
 SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
 SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
 zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
 google-perftools Copyright (c) 2005, Google Inc.
 
+Second Life Viewer uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.
+
 All rights reserved.  See licenses.txt for details.
 
 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-      </text_editor>
+        </text_editor>
       </panel>
     </tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 49deb9b025..9f6eac198b 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -299,7 +299,7 @@ Re-enter amount to see the latest exchange rate.
      type="string"
      font="SansSerifHuge"
      left="165"
-     width="170"
+     width="360"
      height="25"
      top="25"
      name="info_cannot_buy">
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index d5d4565ca1..ab81a86720 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -204,7 +204,7 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="14"
      layout="topleft"
-     left_delta="110"
+     left_delta="125"
      name="region_name_text"
      top_delta="0"
      use_ellipses="true"
@@ -237,7 +237,7 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="14"
      layout="topleft"
-     left_delta="110"
+     left_delta="125"
      name="region_type_text"
      top_delta="0"
      width="175">
@@ -262,7 +262,7 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="14"
      layout="topleft"
-     left_delta="110"
+     left_delta="125"
      name="estate_name_text"
      top_delta="0"
      width="175">
@@ -276,8 +276,8 @@ supports [AMOUNT2] objects
      layout="topleft"
      left="440"
      name="estate_owner_label"
-     right="550"
-     width="100"
+     right="565"
+     width="120"
      word_wrap="true">
         Estate Owner:
     </text>
@@ -287,7 +287,7 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="110"
+     left_delta="125"
      name="estate_owner_text"
      top_delta="0"
      width="175">
diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
index a97c697b24..05f4c52b95 100644
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -80,7 +80,7 @@
      left_pad="10"
      name="antialiasing restart"
      top_delta="0"
-     width="188">
+     width="230">
       (requires viewer restart)
     </text>
     <spinner
diff --git a/indra/newview/skins/default/xui/en/floater_import_collada.xml b/indra/newview/skins/default/xui/en/floater_import_collada.xml
new file mode 100644
index 0000000000..441ab6a2de
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_import_collada.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="false" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" height="160" min_height="160" width="300" min_width="300"
+     name="Import Collada" title="Import Scene">
+
+  <text bottom_delta="40" left="20" name="mesh count" height="15" follows="top|left">
+	Meshes: [COUNT]
+  </text>
+
+  <text bottom_delta="20" left="20" name="texture count" height="15" follows="top|left">
+	Textures: [COUNT]
+  </text>
+
+  <text bottom_delta="40" left="10" name="status" height="15" follows="top|left">
+    Status: [STATUS]
+  </text>
+
+   <button
+	  bottom_delta="40"
+      name="cancel"
+      label="Cancel"
+      enabled="true"
+      height="20"
+      layout="topleft"
+      left="125"
+      width="75" />
+
+   <button
+	  bottom_delta="0"
+      name="ok"
+      label="OK"
+      enabled="true"
+      height="20"
+      layout="topleft"
+      left="210"
+      width="75" />
+
+  <string name="status_idle">Idle</string>
+  <string name="status_uploading">Uploading [NAME]</string>
+  <string name="status_creating">Creating object [NAME]</string>
+  
+ </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index 90fee857fb..c86ed595a7 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -95,6 +95,23 @@
      width="126" />
     <icon
      height="16"
+     image_name="Inv_Mesh"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_mesh"
+     top="142"
+     width="16" />
+    <check_box
+     height="16"
+     label="Meshes"
+     layout="topleft"
+     left_pad="2"
+     name="check_mesh"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
      image_name="Inv_Notecard"
      layout="topleft"
      left="8"
@@ -117,7 +134,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_object"
-     top="142"
+     top="162"
      width="16" />
     <check_box
      height="16"
@@ -134,7 +151,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_script"
-     top="162"
+     top="182"
      width="16" />
     <check_box
      height="16"
@@ -151,7 +168,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_sound"
-     top="182"
+     top="202"
      width="16" />
     <check_box
      height="16"
@@ -168,7 +185,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_texture"
-     top="202"
+     top="222"
      width="16" />
     <check_box
      height="16"
@@ -185,7 +202,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_snapshot"
-     top="222"
+     top="242"
      width="16" />
     <check_box
      height="16"
@@ -203,7 +220,7 @@
      layout="topleft"
      left="8"
      name="All"
-     top="242"
+     top="262"
      width="100" />
     <button
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
new file mode 100644
index 0000000000..a24306456a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater can_close="true" can_drag_on_left="false" can_minimize="false"

+     can_resize="true" height="550" min_height="550" min_width="620"

+     name="Model Preview" title="Upload Model" width="620">

+

+  <string name="status_idle">Idle</string>

+  <string name="status_reading_file">Loading...</string>

+  <string name="status_generating_meshes">Generating Meshes...</string>

+  <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>

+  <string name="high">High</string>

+  <string name="medium">Medium</string>

+  <string name="low">Low</string>

+  <string name="lowest">Lowest</string>

+  <string name="mesh_status_good">Ship it!</string>

+  <string name="mesh_status_na">N/A</string>

+  <string name="mesh_status_none">None</string>

+  <string name="mesh_status_submesh_mismatch">Levels of detail have a different number of textureable faces.</string>

+  <string name="mesh_status_mesh_mismatch">Levels of detail have a different number of mesh instances.</string>

+  <string name="mesh_status_too_many_vertices">Level of detail has too many vertices.</string>

+  <string name="mesh_status_missing_lod">Missing required level of detail.</string>

+  <string name="layer_all">All</string> <!-- Text to display in physics layer combo box for "all layers" -->

+  <string name="decomposing">Analyzing...</string>

+  <string name="simplifying">Simplifying...</string>

+  

+

+  <text left="15" bottom="25" follows="top|left" height="15" name="name_label">

+    Name:

+  </text>

+  <line_editor bottom_delta="20" follows="top|left|right" height="19" max_length_bytes="64" 

+	     name="description_form" prevalidate_callback="ascii" width="290" />

+  

+  <text bottom_delta="20" left="15" follows="left|top" height="15" name="lod_label">

+    Preview:

+  </text>

+  <combo_box bottom_delta="20" follows="left|top" height="18"

+	     name="preview_lod_combo" width="240" tool_tip="LOD to view in preview render">

+    <combo_item name="high">

+      Level of Detail: High

+    </combo_item>

+    <combo_item name="medium">

+      Level of Detail: Medium

+    </combo_item>

+    <combo_item name="low">

+      Level of Detail: Low

+    </combo_item>

+    <combo_item name="lowest">

+      Level of Detail: Lowest

+    </combo_item>

+  </combo_box>

+

+    <menu_button follows="top|left" 

+         image_hover_unselected="Toolbar_Left_Over"

+         image_overlay="OptionsMenu_Off"

+         image_selected="Toolbar_Left_Selected"

+         image_unselected="Toolbar_Left_Off"

+         layout="topleft"

+         left_pad="5"

+         name="options_gear_btn"

+         width="31"

+         height="25"/>

+  <!-- Placeholder panel for 3D preview render -->

+  <panel

+    name="preview_panel"

+    left="15"

+    bevel_style="none"

+    border_style="line"

+    border="true"

+    width="290"

+    height="290"

+    follows="all"/>

+

+  <text bottom_delta="25" left="25" width="100" follows="bottom|left">Upload Details</text>

+  <panel top_pad="5" border="true" left="15" width="290" height="70" follows="bottom|left"

+          bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">

+    <text left="25" follows="bottom|left" width="140" height="15" name="streaming cost">

+      Resource Cost: [COST]

+    </text>

+    <text left="25" top_pad="5" width="140" follows="bottom|left" height="15" name="physics cost">

+      Physics Cost: [COST]

+    </text>

+    <text left="25" top_pad="5" follows="bottom|left" height="15" name="upload fee">

+      Upload Fee: N/A

+    </text>

+  </panel>

+

+  <text left="10" bottom="540" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>

+

+  

+  <button bottom="540" left="300"  follows="bottom|right" height="20" label="Defaults"

+	     width="80" name="reset_btn" tool_tip="Reset to defaults"/>

+  <button bottom="540" left="430"  follows="bottom|right" height="20" label="Upload"

+	     width="80" name="ok_btn" tool_tip="Upload to simulator"/>

+  <button left_pad="10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn"/>

+

+  <tab_container

+    follows="right|top|bottom"

+    top="15"

+    left="310"

+    height="470"

+    width="300"

+    name="import_tab"

+    border="true"

+    tab_position="top">

+

+    <!-- LOD PANEL -->

+    <panel

+      border="true"

+      label="Level of Detail"

+      name="lod_panel">

+

+      <text left="10" width="240" bottom="20" height="15" follows="left|top" name="lod_table_header">

+        Select Level of Detail:

+      </text>

+     

+      <text valign="center" halign="center" bg_visible="true" bottom_delta="16" left="75" width="65" height="18" follows="left|top" value="Triangles"/>

+      <text valign="center" halign="center" bg_visible="true" left_pad="0" width="65" height="18" follows="left|top" value="Vertices"/>

+      <text valign="center" halign="center" left_pad="0" width="65" bg_visible="true" height="18" follows="left|top" value="Status"/>

+      

+      <text valign="center" halign="center" bg_visible="true" name="high_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="High"/>

+      <text valign="center" halign="center" bg_visible="true" name="high_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="high_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="high_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>

+      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_high" left_delta="20" top_delta="0" />

+

+      <text valign="center" halign="center" bg_visible="true" name="medium_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="Medium"/>

+      <text valign="center" halign="center" bg_visible="true" name="medium_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="medium_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="medium_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>

+      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_medium" left_delta="20" top_delta="0" />

+

+      <text valign="center" halign="center" bg_visible="true" name="low_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="Low"/>

+      <text valign="center" halign="center" bg_visible="true" name="low_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="low_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="low_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>

+      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_low" left_delta="20" top_delta="0" />

+

+      <text valign="center" halign="center" bg_visible="true" name="lowest_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="Lowest"/>

+      <text valign="center" halign="center" bg_visible="true" name="lowest_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="lowest_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="lowest_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>

+      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_lowest" left_delta="20" top_delta="0" />

+      

+      <text left="10" width="240" height="15" top_pad="15" follows="left|top" name="lod_table_footer">

+        Level of Detail: [DETAIL]

+      </text>

+

+      <icon height="16" width="16" left="20" follows="left|top" name="lod_status_message_icon"/>

+      <text left_pad="5" width="200" height="28" follows="left|top" top_pad="-15" wrap="true" name="lod_status_message_text"/>

+

+      <text top_pad="-3" left="10" height="15" follows="left|top">

+        Mesh

+      </text>

+

+      <radio_group follows="top|left" height="210" left="30" name="lod_file_or_limit" width="240" value="lod_from_file">

+        <radio_item bottom="195" label="Load from file" name="lod_from_file"/>

+        <radio_item bottom="150" label="Auto generate" name="lod_auto_generate"/>

+        <radio_item bottom="0" label="None" name="lod_none"/>

+      </radio_group>

+

+      <line_editor follows="left|top" bottom_delta="-170" width="140" left="45" value="" name="lod_file" height="20"/>

+      <button bottom_delta="3" name="lod_browse" label="Browse..." left_pad="5" follows="left|top" width="70" height="25"/>

+

+      <combo_box follows="top|left" name="lod_mode" top_pad="22" width="100" left="45" height="20">

+        <combo_item name="triangle_limit">

+          Triangle Limit

+        </combo_item>

+        <combo_item name="error_threshold">

+          Error Threshold

+        </combo_item>

+      </combo_box>

+      <spinner follows="top|left" name="lod_triangle_limit" increment="10" left_pad="5" height="20" width="100" decimal_digits="0" enabled="true"/>

+      <spinner left_delta="0" bottom_delta="0" increment="0.01"  follows="top|left" name="lod_error_threshold" min_val="0" max_val="100" height="20" width="100" decimal_digits="3" visible="false" enabled="true"/>

+

+      <text follows="top|left" name="build_operator_text" left="45" top_pad="10" width="100" height="15">

+        Build Operator:  

+      </text>

+      <text follows="top|left" name="queue_mode_text" left_pad="5" width="100" height="15">

+        Queue Mode:

+      </text>

+      <combo_box follows="top|left" name="build_operator" top_pad="5" left="45" width="100" height="20">

+        <combo_item name="edge_collapse">

+          Edge Collapse

+        </combo_item>

+        <combo_item name="half_edge_collapse">

+          Half Edge Collapse

+        </combo_item>

+      </combo_box>

+

+      <combo_box follows="top|left" name="queue_mode" left_pad="5" width="100" height="20">

+        <combo_item name="greedy">

+          Greedy

+        </combo_item>

+        <combo_item name="lazy">

+          Lazy

+        </combo_item>

+        <combo_item name="independent">

+          Independent

+        </combo_item>

+      </combo_box>

+

+      <text top_pad="10" name="border_mode_text" left="45" follows="left|top" width="100" height="15">

+        Border Mode:

+      </text>

+

+      <text left_pad="5" name="share_tolderance_text"  follows="left|top" width="100" height="15">

+        Share Tolerance:

+      </text>

+

+      <combo_box follows="left|top" left="45" height="20" name="border_mode" width="100">

+        <combo_item name="border_unlock">

+          Unlock

+        </combo_item>

+        <combo_item name="border_lock">

+          Lock

+        </combo_item>

+      </combo_box>

+      <spinner follows="left|top" name="share_tolerance" left_pad="5" width="100" decimal_digits="5" initial_value="0.00001" height="20"/>

+             

+      <text left="10" top_pad="35" follows="top|left" width="240" height="15">

+        Generate Normals

+      </text>

+      <text left="35" top_pad="5" follows="top|left" width="100" height="15" name="crease_label">

+        Crease Angle:

+      </text>

+      <spinner follows="top|left" left_pad="5" min_val="0" max_val="180" value="75" width="60" height="20" name="crease_angle"/>  

+    </panel>

+

+    <!--  PANEL -->

+    <panel

+      border="true"

+      label="Physics"

+      name="physics_panel">

+

+      <!-- PHYSICS GEOMETRY-->

+      <panel

+        follows="top|left"

+        name="physics geometry"

+        left="0"

+        top="0"

+        width="300"

+        height="65"

+        visible="true"

+        border="true"

+        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">

+

+        <radio_group follows="top|left" top="10" width="240" height="40" name="physics_load_radio" value="physics_load_from_file">

+          <radio_item bottom="0" name="physics_load_from_file" label="File:"/>

+          <radio_item bottom="23" name="physics_use_lod" label="Use Level of Detail:"/>

+        </radio_group>

+

+        <combo_box left="180" top="10" follows="left|top" height="18"

+	        name="physics_lod_combo" width="110" tool_tip="LOD to use for physics shape">

+          <combo_item name="physics_lowest">

+            Lowest

+          </combo_item>

+          <combo_item name="physics_low">

+            Low

+          </combo_item>

+          <combo_item name="physics_medium">

+            Medium

+          </combo_item>

+          <combo_item name="physics_high">

+            High

+          </combo_item>

+        </combo_box>

+

+        <line_editor follows="left|top" top_pad="5" width="140" left="60" value="" name="physics_file" height="20"/>

+        <button left_pad="10" name="physics_browse" label="Browse..." follows="left|top" width="70" height="20"/>

+

+        <!--

+        <check_box name="physics_optimize" follows="left|top" width="130" left="10" top_pad="5" height="20" label="Optimize"/>

+        <check_box name="physics_use_hull" follows="left|top" width="130" left_pad="5" height="20" label="Use Convex Hull"/>

+        -->

+     </panel>

+

+

+      <!-- PHYSICS ANALYSIS-->

+      <panel

+       follows="top|left"

+       name="physics analysis"

+       top_pad="0"

+       left="0"

+       width="300"

+       height="130"

+       visible="true"

+       border="true"

+       bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">

+

+        <text follows="left|top" bottom="40" height="30" left="10" font="SansSerifBig">

+          Step 1: Analysis

+        </text>

+        

+        <text top_pad="5" width="50" follows="top|left" height="15">

+          Method:

+        </text>

+        <combo_box name="Method" follows="top|left" left_pad="5" bottom_delta="2" height="20" width="80"/>

+        <text left="160" bottom_delta="-2" width="50" follows="top|left" height="15">

+          Quality:

+        </text>

+        <combo_box name="Decompose Quality" bottom_delta="2" follows="top|left" left_pad="5" height="20" width="80"/>

+

+        <slider name="Smooth" left="10" width="280" follows="top|left" top_pad="10" height="20" label="Smooth:"/>

+

+        <check_box name="Close Holes (Slow)" follows="top|left" top_pad="10" height="15" label="Close Holes (slow)"/>

+                

+        <button left="200" bottom_delta="0" width="90" follows="top|left" label="Analyze" name="Decompose" height="20"/>

+        <button left="200" bottom_delta="0" width="90" follows="top|left" label="Cancel" name="decompose_cancel" visble="false" height="20"/>

+      </panel>

+      

+

+      <!-- PHYSICS SIMPLIFICATION -->

+     <panel

+       follows="top|left"

+       name="physics simplification"

+       left="0"

+       top_pad="0"

+       width="300"

+       height="150"

+       visible="true"

+       border="true"

+       bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">

+

+        <text follows="left|top" bottom="40" height="30" left="10" font="SansSerifBig">

+          Step 2: Simplification

+        </text>

+

+        <text left="10" top_pad="5" height="15" width="140" follows="top|left">

+          Method:

+        </text>

+        

+        <combo_box left_pad="5" height="20" width="120" follows="top|left" name="Simplify Method"/>

+

+        <slider left="10" name="Combine Quality" label="Passes:" label_width="120" width="270" follows="top|left" top_pad="10" height="20"/>

+        <slider name="Detail Scale" label="Detail Scale:" label_width="120" width="270" follows="top|left" top_pad="10" height="20"/>

+        <slider name="Retain%" label="Retain:" label_width="120" width="270" follows="top|left" bottom_delta="0" left_delta="0" visible="false" height="20"/>

+        <button left="190" width="90" follows="top|left" label="Simplify" name="Simplify" height="20"/>

+        <button left="190" bottom_delta="0" width="90" follows="top|left" label="Cancel" name="simplify_cancel" height="20"/>

+        

+      </panel>

+

+      <!-- INFO PANEL -->

+      <panel

+        left="0"

+        top_pad="0"

+        width="300"

+        height="100"

+        follows="left|top"

+        name="physics info"

+        visible="true"

+        border="true" 

+        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">

+

+        <slider name="physics_explode" follows="top|left" top="10" left="10" label="Preview Spread:" min_val="0.0" max_val="3.0" height="20" width="280"/>

+        

+        <text follows="top|left" name="physics_triangles" top_pad="10" height="15" left="10">

+          Triangles: [TRIANGLES]

+        </text>

+        <text follows="top|left" name="physics_points" top_pad="5" height="15">

+          Vertices: [POINTS]

+        </text>

+        <text follows="top|left" name="physics_hulls" top_pad="5" height="15">

+          Hulls: [HULLS]

+        </text>

+

+

+      </panel>

+    </panel>

+

+    <!-- MODIFIERS PANEL -->

+    <panel

+      border="true"

+      label="Modifiers"

+      name="modifiers_panel">

+      <text left="10" width="90" bottom="30" follows="top|left" height="15">

+        Scale:

+      </text>

+      <text left_pad="5" width="140" follows="top|left" height="15">

+        Dimensions:

+      </text>

+

+      <spinner left="10" height="20" follows="top|left" width="80" top_pad="5" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>

+

+      <text left_pad="20" height="15" name="import_dimensions" follows="top|left">

+        [X] x [Y] x [Z] m

+      </text>

+

+      <text left="10" top_pad="20" follows="top|left" height="15">

+        Include:

+      </text>

+

+      <check_box top_pad="5" name="upload_textures" height="15" follows="top|left" label="Textures"/>

+      <check_box top_pad="5" name="upload_skin" height="15" follows="top|left" label="Skin weight"/>

+      <check_box top_pad="5" left="20" name="upload_joints" height="15" follows="top|left" label="Joint positions"/>

+

+      <text left="10" top_pad="4" width="90" bottom="30" follows="top|left" height="15">

+        Pelvis Z Offset:

+      </text>

+

+      <spinner left="10" top_pad="4" height="20" follows="top|left" width="80" value="0.0" min_val="-3.00" max_val="3.0" name="pelvis_offset"/>

+

+    </panel>

+  </tab_container>

+  

+  <!--

+  <button bottom_delta="0" left="10" width="120" name="auto fill" label="Generate LOD" tool_tip="Automatically generate levels of detail"/>

+  <button bottom_delta="0" left="140" width="120" name="smooth normals" label="Generate Normals" tool_tip="Regenerate normals based on mesh shape"/>

+  <button bottom_delta="0" left="260" width="120" name="consolidate" label="Consolidate" tool_tip="Combine similar submeshes (reduces number of submeshes)"/>

+  <button bottom_delta="30" left="260" width="120" name="scrub materials" label="Scrub Materials" tool_tip="Remove all material information (clear textures, set all colors to white)."/>

+  

+  <spinner bottom_delta="0" left="140" width="120" height="16" initial_value="75" label_width="60" name="edge threshold" decimal_digits="0" min_val="0" max_val="180" increment="5" label="Hard Angle" tool_tip="Maximum angle that will be smoothed between triangles when using Generate Normals"/>

+

+  <text bottom_delta="30" follows="top|left" height="15" left="10" name="high_lod_label">

+    High LOD:

+  </text>

+  <combo_box bottom_delta="0" left="97" follows="left|top" height="18" 

+             name="high detail combo" width="100" tool_tip="Specify mesh for this level of detail">

+    <combo_item name="high none" value="none">

+      None

+    </combo_item>

+    <combo_item name="high choose file" value="file">

+      Choose File...

+    </combo_item>

+    <combo_item name="high triangle limit" value="limit">

+      Triangle Limit

+    </combo_item>

+  </combo_box>

+  <spinner bottom_delta="-5" left="200" width="120"  name="high limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>

+  <text bottom_delta="25" follows="top|left" height="15" left="10" name="high info" width="300">

+    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes.  

+    [MESSAGE]

+  </text>

+

+  <text bottom_delta="35" follows="top|left" height="15" left="10" name="medium_lod_label">

+    Medium LOD:

+  </text>

+  <combo_box bottom_delta="0" left="97" follows="left|top" height="18"

+             name="medium detail combo" width="100" tool_tip="Specify mesh for this level of detail">

+    <combo_item name="medium none" value="none">

+      None

+    </combo_item>

+    <combo_item name="medium choose file" value="file">

+      Choose File...

+    </combo_item>

+    <combo_item name="medium triangle limit" value="limit">

+      Triangle Limit

+    </combo_item>

+  </combo_box>

+  <spinner bottom_delta="-5" left="200" width="120"  name="medium limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>

+  <text bottom_delta="25" follows="top|left" height="15" left="10" name="medium info" width="300">

+    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes.  

+    [MESSAGE]

+  </text>

+

+  <text bottom_delta="35" follows="top|left" height="15" left="10" name="low_lod_label">

+    Low LOD:

+  </text>

+  <combo_box bottom_delta="0" left="97" follows="left|top" height="18" 

+             name="low detail combo" width="100" tool_tip="Specify mesh for this level of detail">

+    <combo_item name="low none" value="none">

+      None

+    </combo_item>

+    <combo_item name="low choose file" value="file">

+      Choose File...

+    </combo_item>

+    <combo_item name="low triangle limit" value="limit">

+      Triangle Limit

+    </combo_item>

+  </combo_box>

+  <spinner bottom_delta="-5" left="200" width="120"  name="low limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>

+  <text bottom_delta="25" follows="top|left" height="15" left="10" name="low info" width="300">

+    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes

+    [MESSAGE]

+  </text>

+

+  <text bottom_delta="35" follows="top|left" height="15" left="10" name="lowest_lod_label">

+    Lowest LOD:

+  </text>

+  <combo_box bottom_delta="0" left="97" follows="left|top" height="18" 

+             name="lowest detail combo" width="100" tool_tip="Specify mesh for this level of detail">

+    <combo_item name="lowest none" value="none">

+      None

+    </combo_item>

+    <combo_item name="lowest choose file" value="file">

+      Choose File...

+    </combo_item>

+    <combo_item name="lowest triangle limit" value="limit">

+      Triangle Limit

+    </combo_item>

+  </combo_box>

+  <spinner bottom_delta="-5" left="200" width="120"  name="lowest limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>

+  <text bottom_delta="25" follows="top|left" height="15" left="10" name="lowest info" width="300">

+    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes

+    [MESSAGE]

+  </text>

+

+  <text bottom_delta="35" follows="top|left" height="15" left="10" name="physics_lod_label">

+    Physical Shape:

+  </text>

+  <combo_box bottom_delta="0" left="97" follows="left|top" height="18"

+             name="physics detail combo" width="100">

+    <combo_item name="physics none" value="none">

+      None

+    </combo_item>

+    <combo_item name="physics choose file" value="file">

+      Choose File...

+    </combo_item>

+    <combo_item name="physics triangle limit" value="limit">

+      Triangle Limit...

+    </combo_item>

+  </combo_box>

+  <spinner bottom_delta="-5" left="200" width="90"  name="physics limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>

+  <button bottom_delta="0" left="290" width="30" follows="left|top" height="20" label=">>" 

+          name="decompose_btn" tool_tip="Create convex decomposition."/>

+  <text bottom_delta="25" follows="top|left" height="15" left="10" name="physics info" width="300">

+    [TRIANGLES] Triangles, [HULLS] Hulls, [POINTS] Points

+  </text>

+

+  <text bottom_delta="25" follows="top|left" height="15" left="10" name="include label" width="300">

+    Include:

+  </text>

+

+  <check_box bottom_delta="20" follow="bottom|left" height="20" label="Textures"

+             left="15" width="125" name="upload_textures" tool_tip="Upload associated textures "/>

+

+  <check_box bottom_delta="20" follow="bottom|left" height="20" label="Skin Weights"

+             left="15" width="125" name="upload_skin" tool_tip="Upload vertex skin weighting information."/>

+

+  <check_box bottom_delta="20" follow="bottom|left" height="20" label="Joint Positions"

+             left="15" width="125" name="upload_joints" tool_tip="Upload joint position information (will override avatar joint positions when mesh is worn)."/>

+

+  

+	<button bottom_delta="25" follows="bottom|left" height="20" label="Upload"

+	     left="15" name="ok_btn" width="125" tool_tip="Upload to simulator"/>

+

+  <text bottom_delta="20" left="15" width="280" follows="top|left" height="15" name="description_label" text_color="1 0.82 0.46 1">

+	  (No charge for upload during First Look)

+	</text>

+  <text bottom_delta="20" left="15" width="280" follows="top|left" height="15" name="upload_message">

+    [MESSAGE]

+  </text>

+  

+  <spinner bottom_delta="20" label="Scale" left="15" width="120"  name="debug scale" decimal_digits="3" increment="0.1" min_val="0" max_val="64" initial_value="1" tool_tip="Multiplier for incoming object scale.  If incoming dimensions are very small or very large, modify this value to get dimensions into an acceptable range."/>

+  <text bottom_delta="30" left="15" width="280" follows="top|left" height="15" name="dimensions">

+    Model Dimensions: [X]m x [Y]m x [Z]m

+  </text>

+  -->

+</floater>

diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
new file mode 100644
index 0000000000..6c0fffa60e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -0,0 +1,1039 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+ legacy_header_height="18"

+ layout="topleft"

+ name="Model Wizard"

+ help_topic="model_wizard"

+ bg_opaque_image_overlay="0.5 0.5 0.5 1"

+ height="480"

+ save_rect="true"

+ title="UPLOAD MODEL WIZARD"

+ width="535">

+	<button

+	 top="32"

+	 tab_stop="false"

+	 left="410"

+	 height="32"

+	 name="upload_btn"

+	 enabled="false"

+	 label="5. Upload"

+	 border="false"

+	 image_unselected="BreadCrumbBtn_Right_Off"

+	 image_selected="BreadCrumbBtn_Right_Press"

+	 image_hover_unselected="BreadCrumbBtn_Right_Over"

+	 image_disabled="BreadCrumbBtn_Right_Disabled"

+	 image_disabled_selected="BreadCrumbBtn_Right_Disabled"

+	 width="110">

+		<button.commit_callback

+		function="Wizard.Upload"/>

+	</button>

+	<button

+	 top="32"

+	 left="310"

+	 height="32"

+	 tab_stop="false"

+	 name="review_btn"

+	 label="4. Review"

+	 enabled="false"

+	 border="false"

+	 image_unselected="BreadCrumbBtn_Middle_Off"

+	 image_selected="BreadCrumbBtn_Middle_Press"

+	 image_hover_unselected="BreadCrumbBtn_Middle_Over"

+	 image_disabled="BreadCrumbBtn_Middle_Disabled"

+	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"

+	 width="110">

+		<button.commit_callback

+		function="Wizard.Review"/>

+	</button>

+	<button

+	 top="32"

+	 left="210"

+	 height="32"

+	 name="physics2_btn"

+	 label="3. Physics"

+	 tab_stop="false"

+	 enabled="false"

+	 border="false"

+	 image_unselected="BreadCrumbBtn_Middle_Off"

+	 image_selected="BreadCrumbBtn_Middle_Press"

+	 image_hover_unselected="BreadCrumbBtn_Middle_Over"

+	 image_disabled="BreadCrumbBtn_Middle_Disabled"

+	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"

+	 width="110">

+		<button.commit_callback

+		function="Wizard.Physics2"/>

+	</button>

+	<button

+	 top="32"

+	 left="210"

+	 height="32"

+	 name="physics_btn"

+	 label="3. Physics"

+	 tab_stop="false"

+	 enabled="false"

+	 border="false"

+	 image_unselected="BreadCrumbBtn_Middle_Off"

+	 image_selected="BreadCrumbBtn_Middle_Press"

+	 image_hover_unselected="BreadCrumbBtn_Middle_Over"

+	 image_disabled="BreadCrumbBtn_Middle_Disabled"

+	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"

+	 width="110">

+		<button.commit_callback

+		function="Wizard.Physics"/>

+	</button>

+	<button

+	 top="32"

+	 left="115"

+	 name="optimize_btn"

+	 label="2. Optimize"

+	 tab_stop="false"

+	 height="32"

+	 border="false"

+	 image_unselected="BreadCrumbBtn_Middle_Off"

+	 image_selected="BreadCrumbBtn_Middle_Press"

+	 image_hover_unselected="BreadCrumbBtn_Middle_Over"

+	 image_disabled="BreadCrumbBtn_Middle_Disabled"

+	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"

+	 width="110">

+		<button.commit_callback

+		function="Wizard.Optimize"/>

+	</button>

+	<button

+	 top="32"

+	 left="15"

+	 name="choose_file_btn"

+	 tab_stop="false"

+	 enabled="false"

+	 label="1. Choose File"

+	 height="32"

+	 image_unselected="BreadCrumbBtn_Left_Off"

+	 image_selected="BreadCrumbBtn_Left_Press"

+	 image_hover_unselected="BreadCrumbBtn_Left_Over"

+	 image_disabled="BreadCrumbBtn_Left_Disabled"

+	 image_disabled_selected="BreadCrumbBtn_Left_Disabled"

+	 width="110">

+		<button.commit_callback

+		function="Wizard.Choose"/>

+	</button>

+	<panel

+		 height="388"

+		 top_pad="0"

+		 name="choose_file_panel"

+		 visible="false"

+		 width="535"

+		 left="0">

+		<panel

+		 height="22"

+		 top_pad="15"

+		 width="505"

+		 name="header_panel"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true"

+		 left="15">

+			<text

+			 width="200"

+			 left="10"

+			 top="3"

+			 name="header_text"

+			 text_color="White"

+			 height="10"

+			 font="SansSerifBig"

+			 layout="topleft">

+				Upload Model

+			</text>

+		</panel>

+		<text

+		 top_pad="14"

+		 width="460"

+		 height="20"

+		 name="description"

+		 font="SansSerifSmall"

+		 layout="topleft"

+		 word_wrap="true"

+		 left_delta="5">

+			This wizard will help you import mesh models to Second Life.  First specify a file containing the model you wish to import.  Second Life supports COLLADA (.dae) files.

+		</text>

+		<panel

+		 top_delta="40"

+		 left="15"

+		 height="270"

+		 width="505"

+		 name="content"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true">

+			<text

+			 type="string"

+			 length="1"

+			 text_color="White" 

+			 follows="left|top"

+			 top="10"

+			 height="10"

+			 layout="topleft"

+			 left_delta="10"

+			 name="Cache location"

+			 width="300">

+				Filename:

+			</text>

+			<line_editor

+			 border_style="line"

+			 border_thickness="1"

+			 follows="left|top"

+			 font="SansSerifSmall"

+			 height="20"

+			 layout="topleft"

+			 left_delta="0"

+			 max_length="4096"

+			 name="lod_file"

+			 top_pad="5"

+			 width="220" />

+			<button

+			 follows="left|top"

+			 height="23"

+			 label="Browse..."

+			 label_selected="Browse..."

+			 layout="topleft"

+			 left_pad="5"

+			 name="browse"

+			 top_delta="-1"

+			 width="85">

+			</button>

+			<text

+			 top_delta="-15"

+			 width="200"

+			 height="15"

+			 font="SansSerifSmall"

+			 layout="topleft"

+			 text_color="White"

+			 left_pad="19">

+				Model Preview:

+			</text>

+			<!-- Placeholder panel for 3D preview render -->

+			<panel

+			 left_delta="0"

+			 top_pad="0"

+			 name="preview_panel"

+			 bevel_style="none"

+			 highlight_light_color="0.09 0.09 0.09 1"

+			 border="true"

+			 height="150"

+			 follows="all"

+			 width="150">

+			</panel>

+			<text

+			 top_pad="10"

+			 width="130"

+			 height="14"

+			 left="340"

+			 text_color="White"

+			 word_wrap="true">

+				Dimensions (meters):

+			</text>

+			<text

+			 top_pad="0"

+			 width="160"

+			 height="15"

+			 font="SansSerifSmallBold" 

+			 text_color="White"

+			 name="dimensions"

+			 left_delta="0">

+				X:         Y:         Z: 

+			</text>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_dividers"

+			 left_delta="41">

+				 |               |   

+			</text>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_x"

+			 left="356"/>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_y"

+			 left="403"/>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_z"

+			 left="450"/>

+			<text

+			 top="100"

+			 width="320"

+			 height="15"

+			 left="10"

+			 text_color="White" 

+			 word_wrap="true">

+				Note:

+			</text>

+			<text

+			 top_pad="0"

+			 width="320"

+			 height="40"

+			 left="10"

+			 word_wrap="true">

+Advanced users familiar with 3d content creation tools may prefer to use the [secondlife:///app/floater/upload_model Advanced Mesh Import Window] .

+			</text>

+		</panel>

+	</panel>

+

+

+	<panel

+		 height="388"

+		 top_delta="0"

+		 name="optimize_panel"

+		 visible="false"

+		 width="535"

+		 left="0">

+		<panel

+		 height="22"

+		 top_pad="15"

+		 name="header_panel"

+		 width="505"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true"

+		 left="15">

+			<text

+			 width="200"

+			 left="10"

+			 name="header_text"

+			 top="3"

+			 text_color="White"

+			 height="10"

+			 font="SansSerifBig"

+			 layout="topleft">

+				Optimize

+			</text>

+		</panel>

+		<text

+		 top_pad="14"

+		 width="460"

+		 height="20"

+		 font="SansSerifSmall"

+		 layout="topleft"

+		 name="description"

+		 word_wrap="true"

+		 left_delta="5">

+			This wizard has optimized your model to improve performance. You may adjust the results of the optimization process bellow or click Next to continue.

+		</text>

+		<panel

+		 top_delta="40"

+		 visible="false"

+		 left="15"

+		 height="270"

+		 width="505"

+		 name="content"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true">

+			<text

+			 top="20"

+			 width="300"

+			 height="12"

+			 font="SansSerifBold"

+			 left="112">Generating Level of Detail</text>

+			<progress_bar

+			  name="optimize_progress_bar"

+              image_fill="model_wizard\progress_light.png"

+			  color_bg="1 1 1 1"

+			  color_bar="1 1 1 0.96"

+			  follows="left|right|top"

+			  width="260"

+			  height="16"

+			  image_bar="model_wizard\progress_bar_bg.png"

+			  top_pad="14"

+			  left="110"/>

+			<icon

+			 top_pad="10"

+			 left_delta="0"

+			 width="13"

+			 height="12"

+			 image_name="model_wizard\check_mark.png"/>

+			<text

+			 top_delta="0"

+			 left_delta="18"

+			 name="high_detail_text"

+			 width="200"

+			 height="14">Generate Level of Detail: High</text>

+			<icon

+			 top_pad="10"

+			 left_delta="-18"

+			 width="13"

+			 height="12"

+			 image_name="model_wizard\check_mark.png"/>

+			<text

+			 top_delta="0"

+			 left_delta="18"

+			 name="medium_detail_text"

+			 width="200"

+			 height="14">Generate Level of Detail: Medium</text>

+			<icon

+			 top_pad="10"

+			 left_delta="-18"

+			 width="13"

+			 height="12"

+			 image_name="model_wizard\check_mark.png"/>

+			<text

+			 top_delta="0"

+			 left_delta="18"

+			 name="low_detail_text"

+			 width="200"

+			 height="14">Generate Level of Detail: Low</text>

+			<icon

+			 top_pad="10"

+			 left_delta="-18"

+			 width="13"

+			 height="12"

+			 image_name="model_wizard\check_mark.png"/>

+			<text

+			 top_delta="0"

+			 left_delta="18"

+			 name="lowest_detail_text"

+			 width="200"

+			 height="14">Generate Level of Detail: Lowest</text>

+		</panel>

+		<panel

+				 top_delta="0"

+				 left_delta="0"

+				 height="270"

+				 width="505"

+				 name="content2"

+				 bg_opaque_color="DkGray2"

+				 background_visible="true"

+				 background_opaque="true">

+			<text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">

+				Model Preview:

+			</text>

+			<combo_box left_pad="5" top_delta="-5"  follows="left|top" list_position="below" height="22"

+	     name="preview_lod_combo2" width="90" tool_tip="LOD to view in preview render">

+				<combo_item name="high">

+					High

+				</combo_item>

+				<combo_item name="medium">

+					Medium

+				</combo_item>

+				<combo_item name="low">

+					Low

+				</combo_item>

+				<combo_item name="lowest">

+					Lowest

+				</combo_item>

+			</combo_box>

+			<panel

+				 left="10"

+				 top_pad="5"

+				 name="preview_panel"

+				 bevel_style="none"

+				 highlight_light_color="0.09 0.09 0.09 1"

+				 border_style="line"

+				 border="true"

+				 height="185"

+				 follows="all"

+				 width="185">

+			</panel>

+			<text top="45" left="214" text_color="White" font="SansSerifSmallBold" halign="center" width="110" height="30" wrap="true">Higher Performance</text>

+			<text top="75" left="204" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">Faster rendering but less detailed; lowers Resource (prim) cost.</text>

+			<text top="45" left="378" text_color="White" font="SansSerifSmallBold" halign="center" width="90" height="30" wrap="true">Higher Accuracy</text>

+			<text top="75" left="364" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">More detailed model but slower; increases Resource (prim) cost.</text>

+

+			<slider

+		   follows="left|top"

+		   height="20"

+		   increment="1"

+		   layout="topleft"

+		   left="204"

+		   max_val="3"

+		   initial_value="2"

+		   min_val="0"

+		   name="accuracy_slider"

+		   show_text="false"

+		   top="130"

+		   width="290" />

+			<text 

+			font="SansSerifSmall" 

+			top_pad="0"  

+			width="300" 

+			left_delta="6" 

+			height="4">'  

+      </text>

+

+

+			<icon

+				 top_pad="14"

+				 left_delta="0"

+				 width="280"

+				 height="2"

+				 image_name="model_wizard\divider_line.png"/>

+	

+			<text top_delta="20" width="200" text_color="White" left_delta="50" name="streaming cost"  height="20">Resource Cost:    [COST]</text>

+			<text

+						 top_pad="15"

+						 width="130"

+						 height="14"

+						 left="10"

+						 text_color="White"

+						 word_wrap="true">

+				Dimensions (meters):

+			</text>

+			<text

+			 top_pad="0"

+			 width="160"

+			 height="15"

+			 font="SansSerifSmallBold"

+			 text_color="White"

+			 name="dimensions"

+			 left_delta="0">

+				X:         Y:         Z:

+			</text>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_dividers"

+			 left_delta="41">

+				|               |

+			</text>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_x"

+			 left_delta="-25"/>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_y"

+			 left_delta="46"/>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_z"

+			 left_delta="46"/>

+		</panel>

+	</panel>

+

+	<panel

+		 height="388"

+		 top_delta="0"

+		 name="physics_panel"

+		 visible="false"

+		 width="535"

+		 left="0">

+		<panel

+		 height="22"

+		 top_pad="15"

+		 name="header_panel"

+		 width="505"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true"

+		 left="15">

+			<text

+			 width="200"

+			 left="10"

+			 name="header_text"

+			 top="3"

+			 height="10"

+			 font="SansSerifBig"

+			 text_color="White" 

+			 layout="topleft">

+				Physics

+			</text>

+		</panel>

+		<text

+		 top_pad="10"

+		 width="474"

+		 height="50"

+		 font="SansSerifSmall"

+		 layout="topleft"

+		 name="description"

+		 word_wrap="true"

+		 left_delta="5">

+			The wizard will create a physical shape, which determines how the object interacts with other objects and avatars. Set the slider to the detail level most appropriate for how your object will be used:

+		</text>

+    <panel

+		 top_delta="44"

+		 left="15"

+		 height="270"

+		 width="505"

+		 name="content"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true">

+      <text top="15" left="20" text_color="White" font="SansSerifSmallBold" width="110" height="30" wrap="true" halign="center">Higher Performance</text>

+      <text top="45" left="10" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">Faster rendering but less detailed; lowers Resource (prim) cost.</text>

+      <text top="15" left="372" text_color="White" font="SansSerifSmallBold" width="90" height="30" wrap="true" halign="center">Higher Accuracy</text>

+      <text top="45" left="360" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">More detailed model but slower; increases Resource (prim) cost.</text>

+

+      <slider

+		   follows="left|top"

+		   height="22"

+		   increment=".1"

+		   layout="topleft"

+		   left="20"

+		   max_val="1"

+		   initial_value="0.5"

+		   min_val="0"

+		   name="physics_slider"

+		   show_text="false"

+		   top="90"

+		   width="440" />

+      <text

+			font="SansSerifSmall"

+			top_pad="0"

+			width="500"

+			left_delta="6"

+			height="4">'             '             '             '             '              '             '             '             '              '             '</text>

+      <text top_pad="10" width="110" halign="center" word_wrap="true" left="25"  height="40">Recommended for solid objects</text>

+      <text top_delta="0" width="110" halign="center" word_wrap="true" left="190"  height="40">Recommended for buildings</text>

+      <text top_delta="0" width="110" halign="center" word_wrap="true" left="350"  height="40">Recommended for vehicles</text>

+

+

+		<icon

+			 top_pad="5"

+			 left="15"

+			 width="470"

+			 height="2"

+			 image_name="model_wizard\divider_line.png"/>

+		

+	<text top_delta="30" width="180" text_color="White" left="160" name="streaming cost"  height="20">Resource Cost:       [COST]</text>

+ 

+    </panel>

+	</panel>

+

+	<panel

+		 height="388"

+		 top_delta="0"

+		 name="physics2_panel"

+		 visible="true"

+		 width="535"

+		 left="0">

+		<panel

+		 height="22"

+		 top_pad="15"

+		 name="header_panel"

+		 width="505"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true"

+		 left="15">

+			<text

+			 width="200"

+			 left="10"

+			 name="header_text"

+			 text_color="White"

+			 top="3"

+			 height="10"

+			 font="SansSerifBig"

+			 layout="topleft">

+				Physics

+			</text>

+		</panel>

+		<text

+		 top_pad="14"

+		 width="475"

+		 height="50"

+		 font="SansSerifSmall"

+		 layout="topleft"

+		 name="description"

+		 word_wrap="true"

+		 left_delta="5">

+			Preview the physics shape below then click Next to continue.  To modify the physics shape, click the Back button.

+		</text>

+		<panel

+			 top_delta="40"

+			 left="15"

+			 height="270"

+			 width="505"

+			 name="content"

+			 bg_opaque_color="DkGray2"

+			 background_visible="true"

+			 background_opaque="true">

+			<text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">

+				Model Preview:

+			</text>

+			<combo_box left_pad="5" top_delta="-5"  follows="left|top" list_position="below" height="22"

+			   name="preview_lod_combo3" width="90" tool_tip="LOD to view in preview render">

+				<combo_item name="high">

+					High

+				</combo_item>

+				<combo_item name="medium">

+					Medium

+				</combo_item>

+				<combo_item name="low">

+					Low

+				</combo_item>

+				<combo_item name="lowest">

+					Lowest

+				</combo_item>

+			</combo_box>

+			<panel

+					   left="10"

+					   top_pad="10"

+					   name="preview_panel"

+					   bevel_style="none"

+					   highlight_light_color="0.09 0.09 0.09 1"

+					   border_style="line"

+					   border="true"

+					   height="190"

+					   follows="all"

+					   width="190">

+			</panel>

+			<text

+						 top_pad="8"

+						 width="130"

+						 height="14"

+						 left="10"

+						 text_color="White"

+						 word_wrap="true">

+				Dimensions (meters):

+			</text>

+			<text

+			 top_pad="0"

+			 width="160"

+			 height="15"

+			 font="SansSerifSmallBold"

+			 text_color="White"

+			 name="dimensions"

+			 left_delta="0">

+				X:         Y:         Z:

+			</text>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_dividers"

+			 left_delta="41">

+				|               |

+			</text>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_x"

+			 left_delta="-25"/>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_y"

+			 left_delta="46"/>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_z"

+			 left_delta="46"/>

+			<text top="60" width="180" text_color="White" left="225" name="streaming cost"  height="20">Resource Cost:       [COST]</text>

+		</panel>

+	</panel>

+

+	<panel

+		 height="388"

+		 top_delta="0"

+		 name="review_panel"

+		 visible="false"

+		 width="535"

+		 left="0">

+		<panel

+		 height="22"

+		 top_pad="15"

+		 name="header_panel"

+		 width="505"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true"

+		 left="15">

+			<text

+			 width="200"

+			 left="10"

+			 name="header_text"

+			 text_color="White" 

+			 top="3"

+			 height="10"

+			 font="SansSerifBig"

+			 layout="topleft">

+				Review

+			</text>

+		</panel>

+		<text

+		 top_pad="14"

+		 width="470"

+		 height="24"

+		 font="SansSerifSmall"

+		 layout="topleft"

+		 name="description"

+		 word_wrap="true"

+		 left_delta="5">

+			Review the details below then click. Upload to upload your model. Your L$ balance will be charged when you click Upload.

+		</text>

+		<icon

+			 top_pad="10"

+			 left="20"

+			 width="495"

+			 height="2"

+			 image_name="model_wizard\divider_line.png"/>

+    <panel

+		 top_pad="5"

+		 left="15"

+		 height="270"

+		 width="505"

+		 name="content">

+      <text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">

+        Model Preview:

+      </text>

+      <combo_box left_pad="5" top_delta="-5"  follows="left|top" list_position="below" height="22"

+	     name="preview_lod_combo" width="90" tool_tip="LOD to view in preview render">

+        <combo_item name="high">

+          High

+        </combo_item>

+        <combo_item name="medium">

+          Medium

+        </combo_item>

+        <combo_item name="low">

+          Low

+        </combo_item>

+        <combo_item name="lowest">

+          Lowest

+        </combo_item>

+      </combo_box>

+      <panel

+				 left="10"

+				 top_pad="10"

+				 name="preview_panel"

+				 bevel_style="none"

+				 highlight_light_color="0.09 0.09 0.09 1"

+				 border_style="line"

+				 border="true"

+				 height="190"

+				 follows="all"

+				 width="190">

+			</panel>

+		<text

+					 top_pad="8"

+					 width="130"

+					 height="14"

+					 left="10"

+					 text_color="White"

+					 word_wrap="true">

+			Dimensions (meters):

+		</text>

+		<text

+		 top_pad="0"

+		 width="160"

+		 height="15"

+		 font="SansSerifSmallBold"

+		 text_color="White"

+		 name="dimensions"

+		 left_delta="0">

+			X:         Y:         Z:

+		</text>

+		<text

+		 top_delta="0"

+		 width="160"

+		 height="15"

+		 name="dimension_dividers"

+		 left_delta="41">

+			|               |

+		</text>

+		<text

+		 top_delta="0"

+		 width="160"

+		 height="15"

+		 name="dimension_x"

+		 left_delta="-25"/>

+		<text

+		 top_delta="0"

+		 width="160"

+		 height="15"

+		 name="dimension_y"

+		 left_delta="46"/>

+		<text

+		 top_delta="0"

+		 width="160"

+		 height="15"

+		 name="dimension_z"

+		 left_delta="46"/>

+      </panel>

+    <text

+      width="300"

+      height="12"

+      top="125" 

+	  name="streaming cost" 

+      left="230" 

+      font="SansSerifSmallBold" 

+      text_color="White">Resource Cost:         [COST]</text>

+    <text

+      width="285"

+      height="30"

+      top_pad="0"

+      left_delta="0"

+      word_wrap="true"

+      font="SansSerifItalic">This is the cost to your Region's prim/object limit, at default scale</text>

+	<text

+	 width="300"

+	 height="12"

+	 name="physics cost" 

+	 top_pad="10"

+		 left_delta="0"

+	 font="SansSerifSmallBold"

+	 text_color="White">Physics Cost:        [COST]</text>

+	<text

+	  width="285"

+	  height="30"

+	  top_pad="0"

+		  left_delta="0"

+	  word_wrap="true"

+	  font="SansSerifItalic">This is the cost to your Region's prim/object limit, at default scale</text>

+		<text

+		 width="200"

+		 height="12"

+		 top_pad="10"

+		left_delta="0"

+		 font="SansSerifSmallBold"

+		 text_color="White">Upload Fee:</text>

+		<text

+		  width="285"

+		  height="26"

+		  top_pad="0"

+		  left_delta="0"

+		  word_wrap="true"

+		  font="SansSerifItalic">This is the amount the upload will cost.</text>

+		<check_box

+			height="16"

+			layout="topleft"

+			left_delta="0"

+			name="confirm_checkbox"

+			top_pad="15"

+			width="16" />

+		<text

+		  height="100"

+		  width="240"

+		  word_wrap="true" 

+		  left_delta="25"

+		  top_delta="0">I confirm that I have the appropriate rights to the material contained in this model. [secondlife:///app/floater/learn_more Learn more]</text>

+	</panel>

+

+

+

+

+	<panel

+		 height="388"

+		 top_delta="0"

+		 name="upload_panel"

+		 visible="false"

+		 width="535"

+		 left="0">

+		<panel

+		 height="22"

+		 top_pad="15"

+		 name="header_panel"

+		 width="505"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true"

+		 left="15">

+			<text

+			 width="200"

+			 left="10"

+			 name="header_text"

+			 top="3"

+			 text_color="White" 

+			 height="10"

+			 font="SansSerifBig"

+			 layout="topleft">

+				Upload Complete!

+			</text>

+		</panel>

+		<text

+		 top_pad="14"

+		 width="474"

+		 height="20"

+		 font="SansSerifSmall"

+		 layout="topleft"

+		 name="description"

+		 word_wrap="true"

+		 left_delta="5">

+			Congratulations! Your model has been sucessfully uploaded.  You will find the model in the Objects folder in your inventory.

+		</text>

+		<icon

+			 top_pad="15"

+			 left_delta="0"

+			 width="495"

+			 height="2"

+			 image_name="model_wizard\divider_line.png"/>

+	</panel>

+

+

+

+	<button

+	 top="440"

+	 right="-245"

+	 width="90"

+	 height="22"

+	 name="back"

+	 label="&lt;&lt; Back" />

+	<button

+	 top_delta="0"

+	 right="-150"

+	 width="90"

+	 height="22"

+	 name="next"

+	 label="Next &gt;&gt; " />

+	<button

+	 top_delta="0"

+	 right="-150"

+	 width="90"

+	 height="22"

+	 visible="false" 

+	 name="upload" 

+	 tool_tip="Upload to simulator"

+	 label="Upload" />

+	<button

+	 top_delta="0"

+	 right="-15"

+	 width="90"

+	 height="22"

+	 name="cancel"

+	 label="Cancel" />

+	<button

+	 top_delta="0"

+	 right="-15"

+	 width="90"

+	 height="22"

+	 name="close"

+	 visible="false" 

+	 label="Close" />

+	<spinner visible="false" left="10" height="20" follows="top|left" width="80" top_pad="-50" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>

+

+	<string name="status_idle">Idle</string>

+	<string name="status_reading_file">Loading...</string>

+	<string name="status_generating_meshes">Generating Meshes...</string>

+  <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>

+	<string name="high">High</string>

+	<string name="medium">Medium</string>

+	<string name="low">Low</string>

+	<string name="lowest">Lowest</string>

+	<string name="mesh_status_good">Ship it!</string>

+	<string name="mesh_status_na">N/A</string>

+	<string name="mesh_status_none">None</string>

+	<string name="mesh_status_submesh_mismatch">Levels of detail have a different number of textureable faces.</string>

+	<string name="mesh_status_mesh_mismatch">Levels of detail have a different number of mesh instances.</string>

+	<string name="mesh_status_too_many_vertices">Level of detail has too many vertices.</string>

+	<string name="mesh_status_missing_lod">Missing required level of detail.</string>

+	<string name="layer_all">All</string>

+	<!-- Text to display in physics layer combo box for "all layers" -->

+

+</floater>

diff --git a/indra/newview/skins/default/xui/en/floater_price_for_listing.xml b/indra/newview/skins/default/xui/en/floater_price_for_listing.xml
new file mode 100644
index 0000000000..6312366b86
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_price_for_listing.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="240"
+ layout="topleft"
+ name="price_for_listing"
+ help_topic="price_for_listing"
+ title="PUBLISH CLASSIFIED AD"
+ width="320">
+    <text
+     type="string"
+     length="1"
+     bottom="200"
+     follows="top|left"
+     font="SansSerif"
+     height="165"
+     layout="topleft"
+     left="15"
+     word_wrap="true"
+     name="explanation_text">
+        Your classified ad will run for one week from the day it is published.
+
+Your ad&apos;s position in the classified listings is determined by how much you choose to pay.
+
+The highest paid ads go to the top of the list, and appear higher in searches.
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="top|right"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="140"
+     name="price_text"
+     top_delta="135"
+     width="85">
+        Price for Ad:
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="top|right"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_pad="4"
+     name="price_symbol"
+     top_delta="0"
+     width="20">
+        L$
+    </text>
+    <line_editor
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left_pad="0"
+     max_length="6"
+     top_delta="-4"
+     name="price_edit"
+     width="60" />
+    <button
+     follows="top|left"
+     height="22"
+     label="OK"
+     layout="topleft"
+     left="105"
+     name="set_price_btn"
+     top_pad="22"
+     width="100" />
+    <button
+     follows="top|left"
+     height="22"
+     label="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="cancel_btn"
+     width="100" />
+
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
index 619669d28a..38b305db7e 100644
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
@@ -41,14 +41,14 @@
      follows="top|left"
      left="16"
      name="info_parcel_label"
-     width="48">
+     width="70">
         Parcel:
     </text>
     <text
      top_delta="0"
      follows="top|left"
      height="16"
-     left="56"
+     left="78"
      name="info_parcel"
      right="-20">
         PARCEL NAME
@@ -57,14 +57,14 @@
      follows="top|left"
      left="16"
      name="info_size_label"
-     width="48">
+     width="70">
         Size:
     </text>
     <text
      follows="top|left"
      top_delta="0"
      height="32"
-     left="56"
+     left="78"
      name="info_size"
      right="-20">
         [AREA] m²
@@ -164,14 +164,14 @@
      left_delta="0"
      name="sell_to_agent"
      top_pad="4"
-     width="170" />
+     width="150" />
     <button
      height="20"
      label="Select"
      left_pad="5"
      name="sell_to_select_agent"
      top_delta="0"
-     width="60" />
+     width="90" />
     <text
      follows="top|left"
      font="SansSerif"
@@ -199,20 +199,20 @@
         <radio_item
          bottom="40"
          height="0"
-         left="10"
+         left="2"
          name="none"
          visible="false" />
         <radio_item
          top_pad="10"
-         height="16"
+         height="18"
          label="No, keep ownership of objects"
-         left="10"
+         left="2"
          name="no" />
         <radio_item
          top_pad="10"
          height="16"
          label="Yes, sell objects with land"
-         left="10"
+         left="2"
          name="yes" />
     </radio_group>
     <button
@@ -221,7 +221,7 @@
      name="show_objects"
      left="70"
      top_pad="10"
-     width="110" />
+     width="140" />
     <text
      bottom_delta="30"
      follows="top|left"
@@ -229,7 +229,7 @@
      height="16"
      left="16"
      name="nag_message_label"
-     right="-20">
+     right="-5">
         REMEMBER: All sales are final.
     </text>
     <button
@@ -239,15 +239,15 @@
      left_delta="0"
      name="sell_btn"
      top_pad="10"
-     width="130" />
+     width="185" />
     <button
      follows="bottom|left"
      height="20"
      label="Cancel"
-     left_pad="30"
+     left_pad="5"
      name="cancel_btn"
      top_delta="0"
-     width="90" />
+     width="85" />
     </panel>
     </scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index e413228ddc..ec190ab656 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -100,7 +100,7 @@
      right="-5"
      name="upload_btn"
      top_delta="0"
-     width="100" />
+     width="110" />
     <flyout_button
      follows="left|top"
      height="23"
@@ -147,7 +147,7 @@
      right="-5"
      left_pad="5"
      name="discard_btn"
-     width="100" />
+     width="110" />
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index d0603cb30e..e342b441ac 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1,3021 +1,3194 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- follows="left|top|right"
- height="580"
- layout="topleft"
- bg_opaque_image="Window_NoTitle_Foreground"
- bg_alpha_image="Window_NoTitle_Background"
- name="toolbox floater"
- help_topic="toolbox_floater"
- save_rect="true"
- short_title="BUILD TOOLS"
- single_instance="true"
- save_visibility="true"
- sound_flags="0"
- width="295">
-    <floater.string
-     name="status_rotate">
-        Drag colored bands to rotate object
-    </floater.string>
-    <floater.string
-     name="status_scale">
-        Click and drag to stretch selected side
-    </floater.string>
-    <floater.string
-     name="status_move">
-        Drag to move, shift-drag to copy
-    </floater.string>
-    <floater.string
-     name="status_modifyland">
-        Click and hold to modify land
-    </floater.string>
-    <floater.string
-     name="status_camera">
-        Click and drag to move camera
-    </floater.string>
-    <floater.string
-     name="status_grab">
-        Drag to move, Ctrl to lift, Ctrl+Shift to rotate
-    </floater.string>
-    <floater.string
-     name="status_place">
-        Click inworld to build
-    </floater.string>
-    <floater.string
-     name="status_selectland">
-        Click and drag to select land
-    </floater.string>
-    <floater.string
-     name="grid_screen_text">
-        Screen
-    </floater.string>
-    <floater.string
-     name="grid_local_text">
-        Local
-    </floater.string>
-    <floater.string
-     name="grid_world_text">
-        World
-    </floater.string>
-    <floater.string
-     name="grid_reference_text">
-        Reference
-    </floater.string>
-    <floater.string
-     name="grid_attachment_text">
-        Attachment
-    </floater.string>
-    <button
-     follows="left|top"
-     height="25"
-     image_bottom_pad="1"
-     image_overlay="Tool_Zoom"
-     image_selected="PushButton_Selected_Press"
-     layout="topleft"
-     left="10"
-     name="button focus"
-     tool_tip="Focus"
-     width="35">
-	  <button.commit_callback
-	     function="BuildTool.setTool"
-	     parameter="Focus" />
-	</button>
-    <button
-     follows="left|top"
-      height="25"
-     image_bottom_pad="1"
-     image_overlay="Tool_Grab"
-     image_selected="PushButton_Selected_Press"
-     layout="topleft"
-     left_pad="10"
-     name="button move"
-     tool_tip="Move"
-     width="35">
-	  <button.commit_callback
-	     function="BuildTool.setTool"
-	     parameter="Move" />
-	</button>
-    <button
-     follows="left|top"
-     height="25"
-     image_bottom_pad="1"
-     image_overlay="Tool_Face"
-     image_selected="PushButton_Selected_Press"
-     layout="topleft"
-     left_pad="10"
-     name="button edit"
-     tool_tip="Edit"
-     width="35">
-	  <button.commit_callback
-	     function="BuildTool.setTool"
-	     parameter="Edit" />
-	</button>
-    <button
-     follows="left|top"
-      height="25"
-     image_bottom_pad="1"
-     image_overlay="Tool_Create"
-     image_selected="PushButton_Selected_Press"
-     layout="topleft"
-     left_pad="10"
-     name="button create"
-     tool_tip="Create"
-     width="35">
-	  <button.commit_callback
-	     function="BuildTool.setTool"
-	     parameter="Create" />
-	</button>
-    <button
-     follows="left|top"
-      height="25"
-     image_bottom_pad="1"
-     image_overlay="Tool_Dozer"
-     image_selected="PushButton_Selected_Press"
-     layout="topleft"
-     left_pad="10"
-     name="button land"
-     tool_tip="Land"
-     width="35">
-	  <button.commit_callback
-	     function="BuildTool.setTool"
-	     parameter="Land" />
-	</button>
-    <text
-     height="30"
-     word_wrap="true"
-     use_ellipses="true"
-     type="string"
-     text_color="LabelSelectedDisabledColor"
-     length="1"
-     follows="left|top"
-     layout="topleft"
-     left="8"
-     name="text status"
-     top_pad="3"
-     width="285">
-        Drag to move, shift-drag to copy
-    </text>
-   <radio_group
-     layout="topleft"
-     left="10"
-      height="70"
-      top="59"
-     name="focus_radio_group">
-        <radio_item
-         top_pad="6"
-         label="Zoom"
-         layout="topleft"
-         name="radio zoom" />
-        <radio_item
-         top_pad="6"
-         label="Orbit (Ctrl)"
-         layout="topleft"
-         name="radio orbit" />
-        <radio_item
-         top_pad="6"
-         label="Pan (Ctrl+Shift)"
-         layout="topleft"
-         name="radio pan" />
-		 <radio_group.commit_callback
-	     function="BuildTool.commitRadioFocus"/>
-    </radio_group>
-   <slider_bar
-     follows="left|top"
-     height="14"
-     increment="0.01"
-     initial_value="0.125"
-     layout="topleft"
-     max_val="0.5"
-     top_delta="-2"
-     left_delta="100"
-     name="slider zoom"
-     width="134">
-	 <slider_bar.commit_callback
-	     function="BuildTool.commitZoom"/>
-	</slider_bar>
-   <radio_group
-      left="10"
-      height="70"
-      top="59"
-     layout="topleft"
-     name="move_radio_group">
-        <radio_item
-         top_pad="6"
-         label="Move"
-         layout="topleft"
-         name="radio move" />
-        <radio_item
-		 top_pad="6"
-         label="Lift (Ctrl)"
-         layout="topleft"
-         name="radio lift" />
-        <radio_item
-         top_pad="6"
-         label="Spin (Ctrl+Shift)"
-         layout="topleft"
-         name="radio spin" />
-		 <radio_group.commit_callback
-			function="BuildTool.commitRadioMove"/>
-	</radio_group>
-	<radio_group
-     follows="left|top"
-	 left="5"
-	 top="59"
-	 height="70"
-     layout="topleft"
-	 name="edit_radio_group">
-        <radio_item
-		 label="Move"
-		 layout="topleft"
-		 name="radio position" />
-        <radio_item
-		 top_pad="6"
-         label="Rotate (Ctrl)"
-         layout="topleft"
-         name="radio rotate" />
-        <radio_item
-		 top_pad="6"
-         label="Stretch (Ctrl+Shift)"
-         layout="topleft"
-         name="radio stretch" />
-        <radio_item
-		 top_pad="6"
-         label="Select Face"
-         layout="topleft"
-         name="radio select face" />
-			<radio_group.commit_callback
-			function="BuildTool.commitRadioEdit"/>
-    </radio_group>
-    <check_box
-     left="5"
-     follows="left|top"
-     height="28"
-	 control_name="EditLinkedParts"
-     label="Edit linked"
-     layout="topleft"
-     name="checkbox edit linked parts"
-     top_pad="-10">
-		  <check_box.commit_callback
-			function="BuildTool.selectComponent"/>
-	</check_box>
-
-   <button
-     follows="left|top"
-     height="23"
-     label="Link"
-     top_pad="2"
-     layout="topleft"
-     left="5"
-     name="link_btn"
-     width="50">
-	  <button.commit_callback
-	     function="BuildTool.LinkObjects"/>
-    </button>
-    <button
-     follows="left|top"
-     height="23"
-     label="Unlink"
-     layout="topleft"
-     left_pad="2"
-     name="unlink_btn"
-     width="50">
-	  <button.commit_callback
-	     function="BuildTool.UnlinkObjects"/>
-    </button>
-    <text
-	   text_color="LtGray_50"
-	   follows="top|left"
-	   halign="left"
-	   left_pad="3"
-	   name="RenderingCost"
-	   tool_tip="Shows the rendering cost calculated for this object"
-	   top_delta="11"
-	   type="string"
-	   width="100">
-	   þ: [COUNT]
-	   </text>
-	<check_box
-     control_name="ScaleUniform"
-     height="19"
-     label=""
-     layout="topleft"
-     left="143"
-     name="checkbox uniform"
-	 top="50"
-     width="20" />
-    <text
-     height="19"
-     label="Stretch Both Sides"
-     left="163"
-     name="checkbox uniform label"
-     top="55"
-     width="120"
-     wrap="true">
-     	Stretch Both Sides
-    </text>
-    <check_box
-     control_name="ScaleStretchTextures"
-     height="19"
-     initial_value="true"
-     label="Stretch Textures"
-     layout="topleft"
-     left="143"
-     name="checkbox stretch textures"
-     top_pad="-6"
-     width="134" />
-   <check_box
-     control_name="SnapEnabled"
-     height="18"
-     initial_value="true"
-     label="Snap to grid"
-     layout="topleft"
-     top_pad="0"
-     name="checkbox snap to grid"
-     width="134" />
-    <combo_box
-     height="23"
-     layout="topleft"
-     follows="left|top"
-     name="combobox grid mode"
-     tool_tip="Choose the type of grid ruler for positioning the object"
-     top_pad="0"
-     width="108">
-        <combo_box.item
-         label="World grid"
-         name="World"
-         value="World" />
-        <combo_box.item
-         label="Local grid"
-         name="Local"
-         value="Local" />
-        <combo_box.item
-         label="Reference grid"
-         name="Reference"
-         value="Reference" />
-		 <combo_box.commit_callback
-	     function="BuildTool.gridMode"/>
-    </combo_box>
-    <button
-     left_pad="0"
-     image_selected="ForwardArrow_Press"
-     image_unselected="ForwardArrow_Off"
-     layout="topleft"
-     name="Options..."
-     tool_tip="See more grid options"
-     top_delta="0"
-     right="-10"
-     width="18"
-     height="23" >
-	 <button.commit_callback
-	     function="BuildTool.gridOptions"/>
-	</button>
-   <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Cube"
-     image_disabled_selected="Object_Cube"
-     image_selected="Object_Cube_Selected"
-     image_unselected="Object_Cube"
-     layout="topleft"
-     left="10"
-     name="ToolCube"
-     tool_tip="Cube"
-     top="51"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Prism"
-     image_disabled_selected="Object_Prism"
-     image_selected="Object_Prism_Selected"
-     image_unselected="Object_Prism"
-     layout="topleft"
-     left_delta="29"
-     name="ToolPrism"
-     tool_tip="Prism"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Pyramid"
-     image_disabled_selected="Object_Pyramid"
-     image_selected="Object_Pyramid_Selected"
-     image_unselected="Object_Pyramid"
-     layout="topleft"
-     left_delta="29"
-     name="ToolPyramid"
-     tool_tip="Pyramid"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Tetrahedron"
-     image_disabled_selected="Object_Tetrahedron"
-     image_selected="Object_Tetrahedron_Selected"
-     image_unselected="Object_Tetrahedron"
-     layout="topleft"
-     left_delta="29"
-     name="ToolTetrahedron"
-     tool_tip="Tetrahedron"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Cylinder"
-     image_disabled_selected="Object_Cylinder"
-     image_selected="Object_Cylinder_Selected"
-     image_unselected="Object_Cylinder"
-     layout="topleft"
-     left_delta="29"
-     name="ToolCylinder"
-     tool_tip="Cylinder"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Hemi_Cylinder"
-     image_disabled_selected="Object_Hemi_Cylinder"
-     image_selected="Object_Hemi_Cylinder_Selected"
-     image_unselected="Object_Hemi_Cylinder"
-     layout="topleft"
-     left_delta="29"
-     name="ToolHemiCylinder"
-     tool_tip="Hemicylinder"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Cone"
-     image_disabled_selected="Object_Cone"
-     image_selected="Object_Cone_Selected"
-     image_unselected="Object_Cone"
-     layout="topleft"
-     left_delta="29"
-     name="ToolCone"
-     tool_tip="Cone"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Hemi_Cone"
-     image_disabled_selected="Object_Hemi_Cone"
-     image_selected="Object_Hemi_Cone_Selected"
-     image_unselected="Object_Hemi_Cone"
-     layout="topleft"
-     left_delta="29"
-     name="ToolHemiCone"
-     tool_tip="Hemicone"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Sphere"
-     image_disabled_selected="Object_Sphere"
-     image_selected="Object_Sphere_Selected"
-     image_unselected="Object_Sphere"
-     layout="topleft"
-     left_delta="29"
-     name="ToolSphere"
-     tool_tip="Sphere"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Hemi_Sphere"
-     image_disabled_selected="Object_Hemi_Sphere"
-     image_selected="Object_Hemi_Sphere_Selected"
-     image_unselected="Object_Hemi_Sphere"
-     layout="topleft"
-     left_delta="29"
-     name="ToolHemiSphere"
-     tool_tip="Hemisphere"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Torus"
-     image_disabled_selected="Object_Torus"
-     image_selected="Object_Torus_Selected"
-     image_unselected="Object_Torus"
-     layout="topleft"
-     left="10"
-     name="ToolTorus"
-     tool_tip="Torus"
-     top="77"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Tube"
-     image_disabled_selected="Object_Tube"
-     image_selected="Object_Tube_Selected"
-     image_unselected="Object_Tube"
-     layout="topleft"
-     left_delta="29"
-     name="ToolTube"
-     tool_tip="Tube"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Ring"
-     image_disabled_selected="Object_Ring"
-     image_selected="Object_Ring_Selected"
-     image_unselected="Object_Ring"
-     layout="topleft"
-     left_delta="29"
-     name="ToolRing"
-     tool_tip="Ring"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Tree"
-     image_disabled_selected="Object_Tree"
-     image_selected="Object_Tree_Selected"
-     image_unselected="Object_Tree"
-     layout="topleft"
-     left_delta="29"
-     name="ToolTree"
-     tool_tip="Tree"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Grass"
-     image_disabled_selected="Object_Grass"
-     image_selected="Object_Grass_Selected"
-     image_unselected="Object_Grass"
-     image_overlay_color="Red"
-     layout="topleft"
-     left_delta="29"
-     name="ToolGrass"
-     tool_tip="Grass"
-     top_delta="0"
-     width="20" />
-    <check_box
-     control_name="CreateToolKeepSelected"
-     height="19"
-     label="Keep Tool selected"
-     layout="topleft"
-     left="4"
-     name="checkbox sticky"
-     top="101"
-     width="128" />
-    <check_box
-     control_name="CreateToolCopySelection"
-     height="19"
-     label="Copy selection"
-     layout="topleft"
-     left_delta="0"
-     name="checkbox copy selection"
-     top_delta="15"
-     width="134" />
-    <check_box
-     control_name="CreateToolCopyCenters"
-     height="19"
-     initial_value="true"
-     label="Center Copy"
-     layout="topleft"
-     left_delta="18"
-     name="checkbox copy centers"
-     top="132"
-     width="134" />
-    <check_box
-     control_name="CreateToolCopyRotates"
-     height="19"
-     label="Rotate Copy"
-     layout="topleft"
-     left_delta="0"
-     name="checkbox copy rotates"
-     top_delta="16"
-     width="134" />
-    <radio_group
-     height="105"
-     layout="topleft"
-     left="4"
-     name="land_radio_group"
-     top="54"
-     width="114">
-        <radio_item
-         height="19"
-         label="Select Land"
-         layout="topleft"
-         left="0"
-         name="radio select land"
-         top="-106"
-         width="134" />
-        <radio_item
-         height="19"
-         label="Flatten"
-         layout="topleft"
-         left_delta="0"
-         name="radio flatten"
-         top_delta="15"
-         width="114" />
-        <radio_item
-         height="19"
-         label="Raise"
-         layout="topleft"
-         left_delta="0"
-         name="radio raise"
-         top_delta="15"
-         width="114" />
-        <radio_item
-         height="19"
-         label="Lower"
-         layout="topleft"
-         left_delta="0"
-         name="radio lower"
-         top_delta="15"
-         width="114" />
-        <radio_item
-         height="19"
-         label="Smooth"
-         layout="topleft"
-         left_delta="0"
-         name="radio smooth"
-         top_delta="15"
-         width="114" />
-        <radio_item
-         height="19"
-         label="Roughen"
-         layout="topleft"
-         left_delta="0"
-         name="radio noise"
-         top_delta="15"
-         width="114" />
-        <radio_item
-         height="19"
-         label="Revert"
-         layout="topleft"
-         left_delta="0"
-         name="radio revert"
-         top_delta="15"
-         width="114" />
-		 <radio_group.commit_callback
-	     function="BuildTool.commitRadioLand"/>
-    </radio_group>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="135"
-     name="Bulldozer:"
-     top="57"
-     width="100">
-        Bulldozer:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     name="Dozer Size:"
-     left="135"
-     top_pad="5"
-     width="50">
-        Size
-    </text>
-    <slider_bar
-	 control_name ="LandBrushSize"
-     follows="left|top"
-     height="19"
-     initial_value="2.0"
-     layout="topleft"
-     max_val="11"
-     min_val="1"
-     left_pad="0"
-     name="slider brush size"
-     top_delta="-3"
-     width="80" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     name="Strength:"
-     left="135"
-     top_pad="5"
-     width="50">
-        Strength
-    </text>
-    <slider_bar
-     follows="left|top"
-     height="19"
-     left_pad="0"
-     initial_value="0.00"
-     layout="topleft"
-     max_val="2"
-     min_val="-1"
-     name="slider force"
-     top_delta="-3"
-     width="80" >
-	  <slider_bar.commit_callback
-	     function="BuildTool.LandBrushForce"/>
-    </slider_bar>
-    <button
-     follows="left|top"
-     height="23"
-     label="Apply"
-     label_selected="Apply"
-     top_pad="5"
-     layout="topleft"
-     left="135"
-     name="button apply to selection"
-     tool_tip="Modify selected land"
-     width="82">
-	  <button.commit_callback
-	     function="BuildTool.applyToSelection"/>
-    </button>
-    <text
-    text_color="LtGray_50"
-     type="string"
-     length="1"
-     height="10"
-     follows="left|top"
-     halign="right"
-     layout="topleft"
-     right="-10"
-     name="obj_count"
-     top_pad="7"
-     width="143">
-        Objects: [COUNT]
-    </text>
-    <text
-    text_color="LtGray_50"
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="right"
-     layout="topleft"
-     right="-10"
-     name="prim_count"
-     width="143">
-        Prims: [COUNT]
-    </text>
-    <tab_container
-     follows="left|top"
-     height="410"
-     halign="center"
-     left="0"
-     name="Object Info Tabs"
-     tab_max_width="100"
-     tab_min_width="40"
-     tab_position="top"
-     tab_height="25"
-     top="173"
-     width="295">
-	<panel
-	 border="false"
-	 follows="all"
-	 label="General"
-	 layout="topleft"
-	 mouse_opaque="false"
-	 help_topic="toolbox_general_tab"
-	 name="General"
-	 top="16"
-	 width="295">
-	 <panel.string
-	  name="text deed continued">
-		Deed
-	 </panel.string>
-	<panel.string
-	 name="text deed">
-		Deed
-	</panel.string>
-            <panel.string
-             name="text modify info 1">
-                You can modify this object
-            </panel.string>
-            <panel.string
-             name="text modify info 2">
-                You can modify these objects
-            </panel.string>
-            <panel.string
-             name="text modify info 3">
-                You can't modify this object
-            </panel.string>
-            <panel.string
-             name="text modify info 4">
-                You can't modify these objects
-            </panel.string>
-            <panel.string
-             name="text modify warning">
-                You must select entire object to set permissions
-            </panel.string>
-            <panel.string
-             name="Cost Default">
-                Price: L$
-            </panel.string>
-            <panel.string
-             name="Cost Total">
-                Total Price: L$
-            </panel.string>
-            <panel.string
-             name="Cost Per Unit">
-                Price Per: L$
-            </panel.string>
-            <panel.string
-             name="Cost Mixed">
-                Mixed Price
-            </panel.string>
-            <panel.string
-             name="Sale Mixed">
-                Mixed Sale
-            </panel.string>
-            <text
-             follows="left|top"
-             height="10"
-             left="10"
-             name="Name:"
-             top="5"
-             width="90">
-                Name:
-            </text>
-            <line_editor
-             follows="left|top|right"
-             height="19"
-             left_pad="0"
-             max_length_bytes="63"
-             name="Object Name"
-             select_on_focus="true"
-             top_delta="0"
-             width="170" />
-            <text
-             follows="left|top"
-             height="10"
-             left="10"
-             name="Description:"
-             top_pad="3"
-             width="90">
-                Description:
-            </text>
-            <line_editor
-             follows="left|top|right"
-             height="19"
-             left_pad="0"
-             max_length_bytes="127"
-             name="Object Description"
-             select_on_focus="true"
-             top_delta="0"
-             width="170" />
-            <text
-             type="string"
-             left="10"
-             length="1"
-             follows="left|top"
-             height="19"
-             layout="topleft"
-             name="Creator:"
-             top_pad="7"
-             width="90">
-                Creator:
-            </text>
-            <!-- *NOTE: Intentionally wide for long names -->
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             left_pad="0"
-             height="20"
-             layout="topleft"
-             name="Creator Name"
-             top_delta="0"
-             translate="false"
-             width="190"
-             word_wrap="true"
-             use_ellipses="true">
-                TestString PleaseIgnore (please.ignore)
-            </text>
-            <text
-             type="string"
-             length="1"
-             left="10"
-             follows="left|top"
-             height="19"
-             layout="topleft"
-             name="Owner:"
-             top_pad="13"
-             width="90">
-                Owner:
-            </text>
-            <!-- *NOTE: Intentionally wide for long names -->
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="20"
-             layout="topleft"
-             name="Owner Name"
-             left_pad="0"
-             top_delta="0"
-             translate="false"
-             width="190"
-             word_wrap="true"
-             use_ellipses="true">
-                TestString PleaseIgnore (please.ignore)
-            </text>
-           <text
-             type="string"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left="10"
-             height="18"
-             name="Group:"
-             top_pad="17"
-             width="75">
-                Group:
-            </text>
-            <name_box
-             follows="left|top"
-             height="18"
-             initial_value="Loading..."
-             layout="topleft"
-             left_pad="23"
-             name="Group Name Proxy"
-             width="142" />
-            <button
-			 follows="top|left"
-			 height="23"
-			 image_overlay="Edit_Wrench"
-			 layout="topleft"
-			 left_pad="13"
-			 name="button set group"
-			 tab_stop="false"
-			 tool_tip="Choose a group to share this object's permissions"
-			 width="23" />
-            <check_box
-             height="19"
-             follows="left|top"
-             label="Share"
-             layout="topleft"
-             name="checkbox share with group"
-             tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-             top_pad="10"
-             left="100"
-             width="87" />
-            <button
-             follows="top|left"
-             height="23"
-             label="Deed"
-             label_selected="Deed"
-             layout="topleft"
-             name="button deed"
-             left_pad="19"
-             tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."
-             width="80" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             top_pad="10"
-             left="10"
-             name="label click action"
-             width="118">
-                Click to:
-            </text>
-            <combo_box
-             follows="left|top"
-             height="23"
-             layout="topleft"
-             name="clickaction"
-             width="148"
-             left_pad="10">
-                <combo_box.item
-                 label="Touch  (default)"
-                 name="Touch/grab(default)"
-                 value="Touch" />
-                <combo_box.item
-                 label="Sit on object"
-                 name="Sitonobject"
-                 value="Sit" />
-                <combo_box.item
-                 label="Buy object"
-                 name="Buyobject"
-                 value="Buy" />
-                <combo_box.item
-                 label="Pay object"
-                 name="Payobject"
-                 value="Pay" />
-                <combo_box.item
-                 label="Open"
-                 name="Open"
-                 value="Open" />
-				 <combo_box.item
-                 label="Zoom"
-                 name="Zoom"
-                 value="Zoom" />
-            </combo_box>
-            <check_box
-             height="23"
-             label="For Sale:"
-             layout="topleft"
-             name="checkbox for sale"
-             left="7"
-             width="100" />
-<!-- NEW SALE TYPE COMBO BOX -->
-      <combo_box
-            left_pad="10"
-            layout="topleft"
-            follows="left|top"
-            allow_text_entry="false"
-            height="23"
-            initial_value="2"
-            max_chars="20"
-            mouse_opaque="true"
-            name="sale type"
-            width="168">
-        <combo_box.item
-           name="Copy"
-           label="Copy"
-           value="2" />
-        <combo_box.item
-           name="Contents"
-           label="Contents"
-           value="3" />
-        <combo_box.item
-           name="Original"
-           label="Original"
-           value="1" />
-      </combo_box>
-<!-- NEW PRICE SPINNER
-Objects are allowed to be for sale for L$0 to invoke buy UI behavior
-even though the user gets a free copy.
--->
-    <spinner
-        follows="left|top"
-        decimal_digits="0"
-        increment="1"
-        top_pad="8"
-        left="118"
-        control_name="Edit Cost"
-        name="Edit Cost"
-        label="Price: L$"
-        label_width="65"
-        width="165"
-        min_val="0"
-        height="20"
-        max_val="999999999" />
-      <check_box
-	   height="15"
-	   width="110"
-	   top_pad="5"
-	   label="Show in search"
-       layout="topleft"
-	   left="100"
-       name="search_check"
-       tool_tip="Let people see this object in search results" />
-		<panel
-         border="false"
-         follows="left|top"
-         layout="topleft"
-         mouse_opaque="false"
-         background_visible="true"
-         bg_alpha_color="DkGray"
-         name="perms_build"
-         left="0"
-         top_pad="4"
-         height="105"
-         width="290">
-            <text
-             type="string"
-             length="1"
-             left="10"
-             top_pad="9"
-             text_color="EmphasisColor"
-             height="16"
-             follows="left|top|right"
-             layout="topleft"
-             name="perm_modify"
-             width="264">
-                You can modify this object
-            </text>
-            <text
-               type="string"
-               follows="left|top"
-               name="Anyone can:"
-               width="250"
-               left="10">
-                 Anyone:
-            </text>
-            <check_box
-             height="19"
-             label="Move"
-             layout="topleft"
-             name="checkbox allow everyone move"
-             left="10"
-             width="85" />
-            <check_box
-             height="19"
-             label="Copy"
-             layout="topleft"
-             left_pad="0"
-             name="checkbox allow everyone copy"
-             width="90" />
-            <text
-               type="string"
-               follows="left|top"
-               height="19"
-               name="Next owner can:"
-               width="250"
-               left="10">
-                  Next owner:
-            </text>
-            <check_box
-             follows="left|top|right"
-             label="Modify"
-             layout="topleft"
-             left="10"
-             name="checkbox next owner can modify"
-             width="85" />
-            <check_box
-             follows="left|top|right"
-             height="19"
-             label="Copy"
-             layout="topleft"
-             left_pad="0"
-             name="checkbox next owner can copy"
-             width="80" />
-            <check_box
-             follows="left|top|right"
-             height="19"
-             label="Transfer"
-             layout="topleft"
-             name="checkbox next owner can transfer"
-             left_pad="0"
-             top_delta="0"
-             tool_tip="Next owner can give away or resell this object"
-             width="100" />
-<!-- *NOTE: These "B/O/G/E/N/F fields may overlap "perm_modify" above, 
-     but that's OK, this is used only for debugging. -->
-            <text
-             type="string"
-             text_color="EmphasisColor"
-             length="1"
-             top="9"
-             follows="left|top"
-             layout="topleft"
-             left="230"
-             name="B:"
-             height="10"
-             width="80">
-                B:
-            </text>
-            <text
-             type="string"
-             text_color="White"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_delta="0"
-             top_pad="2"
-             name="O:"
-             height="10"
-             width="80">
-                O:
-            </text>
-            <text
-             type="string"
-             text_color="EmphasisColor"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_delta="0"
-             top_pad="2"
-             name="G:"
-             height="10"
-             width="80">
-                G:
-            </text>
-            <text
-             type="string"
-             text_color="White"
-             length="1"
-             follows="left|top"
-             left_delta="0"
-             top_pad="2"
-             layout="topleft"
-             name="E:"
-             height="10"
-             width="80">
-                E:
-            </text>
-            <text
-             type="string"
-             text_color="EmphasisColor"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_delta="0"
-             top_pad="2"
-             name="N:"
-             height="10"
-             width="80">
-                N:
-            </text>
-            <text
-             type="string"
-             text_color="White"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_delta="0"
-             top_pad="2"
-             name="F:"
-             height="10"
-             width="80">
-                F:
-            </text>
-        </panel>
-      </panel>
-      <!-- Object tab -->
-      <panel
-         border="false"
-         follows="all"
-         height="367"
-         label="Object"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="toolbox_object_tab"
-         name="Object"
-         top="16"
-         width="295">
-            <check_box
-             height="19"
-             label="Locked"
-             layout="topleft"
-             name="checkbox locked"
-             tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
-             top_pad="5"
-             left="10"
-             width="123" />
-            <check_box
-             height="19"
-             label="Physical"
-             layout="topleft"
-             name="Physical Checkbox Ctrl"
-             tool_tip="Allows object to be pushed and affected by gravity"
-             top_pad="0"
-             width="123" />
-            <check_box
-             height="19"
-             label="Temporary"
-             layout="topleft"
-             name="Temporary Checkbox Ctrl"
-             tool_tip="Causes object to be deleted 1 minute after creation"
-             top_pad="0"
-             width="123" />
-            <check_box
-             height="19"
-             label="Phantom"
-             layout="topleft"
-             name="Phantom Checkbox Ctrl"
-             tool_tip="Causes object to not collide with other objects or avatars"
-             top_pad="0"
-             width="123" />
-
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             name="label position"
-             top_pad="10"
-             width="121">
-                Position (meters)
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="X"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="512"
-             min_val="-256"
-             name="Pos X"
-             text_enabled_color="1 0 0.3 .7"
-             top_pad="5"
-             width="87" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Y"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="512"
-             min_val="-256"
-             name="Pos Y"
-             text_enabled_color="EmphasisColor"
-             top_pad="3"
-             width="87" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Z"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="4096"
-             name="Pos Z"
-             text_enabled_color="0 0.8 1 .65"
-             top_pad="3"
-             width="87" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="label size"
-             top_pad="6"
-             width="121">
-                Size (meters)
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="X"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             min_val="0.01"
-             name="Scale X"
-             text_enabled_color="1 1 1 1"
-             top_pad="5"
-             width="87" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Y"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             min_val="0.01"
-             name="Scale Y"
-             text_enabled_color="1 1 1 1"
-             top_pad="3"
-             width="87" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Z"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             min_val="0.01"
-             name="Scale Z"
-             text_enabled_color="1 1 1 1"
-             top_pad="3"
-             width="87" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="label rotation"
-             top_pad="10"
-             width="121">
-                Rotation (degrees)
-            </text>
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="1"
-             initial_value="0"
-             label="X"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="9999"
-             min_val="-9999"
-             name="Rot X"
-             text_enabled_color="1 1 1 1"
-             top_pad="5"
-             width="87" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="1"
-             initial_value="0"
-             label="Y"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="9999"
-             min_val="-9999"
-             name="Rot Y"
-             text_enabled_color="1 1 1 1"
-             top_pad="3"
-             width="87" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="1"
-             initial_value="0"
-             label="Z"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="9999"
-             min_val="-9999"
-             name="Rot Z"
-             text_enabled_color="1 1 1 1"
-             top_pad="3"
-             width="87" />
-
- <!--           <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="label basetype"
-             top="5"
-             width="150">
-                Prim Type
-            </text>-->
-            <combo_box
-             height="19"
-             layout="topleft"
-             name="comboBaseType"
-             top="6"
-             left="125"
-             width="150">
-                <combo_box.item
-                 label="Box"
-                 name="Box"
-                 value="Box" />
-                <combo_box.item
-                 label="Cylinder"
-                 name="Cylinder"
-                 value="Cylinder" />
-                <combo_box.item
-                 label="Prism"
-                 name="Prism"
-                 value="Prism" />
-                <combo_box.item
-                 label="Sphere"
-                 name="Sphere"
-                 value="Sphere" />
-                <combo_box.item
-                 label="Torus"
-                 name="Torus"
-                 value="Torus" />
-                <combo_box.item
-                 label="Tube"
-                 name="Tube"
-                 value="Tube" />
-                <combo_box.item
-                 label="Ring"
-                 name="Ring"
-                 value="Ring" />
-                <combo_box.item
-                 label="Sculpted"
-                 name="Sculpted"
-                 value="Sculpted" />
-            </combo_box>
-            <combo_box
-             height="19"
-             layout="topleft"
-             name="material"
-             top_pad="5"
-             width="150">
-                <combo_box.item
-                 label="Stone"
-                 name="Stone"
-                 value="Stone" />
-                <combo_box.item
-                 label="Metal"
-                 name="Metal"
-                 value="Metal" />
-                <combo_box.item
-                 label="Glass"
-                 name="Glass"
-                 value="Glass" />
-                <combo_box.item
-                 label="Wood"
-                 name="Wood"
-                 value="Wood" />
-                <combo_box.item
-                 label="Flesh"
-                 name="Flesh"
-                 value="Flesh" />
-                <combo_box.item
-                 label="Plastic"
-                 name="Plastic"
-                 value="Plastic" />
-                <combo_box.item
-                 label="Rubber"
-                 name="Rubber"
-                 value="Rubber" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="text cut"
-             top_pad="5"
-             width="150">
-                Path Cut (begin/end)
-            </text>
-            <spinner
-             follows="left|top"
-             height="16"
-             increment="0.025"
-             initial_value="0"
-             label="B"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="0.98"
-             name="cut begin"
-             top_pad="4"
-             width="68" />
-            <spinner
-             follows="left|top"
-             height="16"
-             increment="0.025"
-             initial_value="1"
-             label="E"
-             label_width="10"
-             layout="topleft"
-             left_pad="10"
-             min_val="0.02"
-             name="cut end"
-             top_delta="0"
-             width="68" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="text hollow"
-             top_pad="6"
-             width="68">
-                Hollow
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_pad="10"
-             name="text skew"
-             width="63">
-                Skew
-            </text>
-            <spinner
-             decimal_digits="1"
-             follows="left|top"
-             height="19"
-             increment="5"
-             initial_value="0"
-             layout="topleft"
-             left="125"
-             max_val="95"
-             name="Scale 1"
-             top_pad="4"
-             width="68" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             layout="topleft"
-             left_pad="10"
-             max_val="0.95"
-             min_val="-0.95"
-             name="Skew"
-             top_delta="0"
-             width="68" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="15"
-             layout="topleft"
-             left="125"
-             name="Hollow Shape"
-             top_pad="4"
-             width="150">
-                Hollow Shape
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="hole"
-             top_pad="-2"
-             width="150">
-                <combo_box.item
-                 label="Default"
-                 name="Default"
-                 value="Default" />
-                <combo_box.item
-                 label="Circle"
-                 name="Circle"
-                 value="Circle" />
-                <combo_box.item
-                 label="Square"
-                 name="Square"
-                 value="Square" />
-                <combo_box.item
-                 label="Triangle"
-                 name="Triangle"
-                 value="Triangle" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="text twist"
-             top_pad="5"
-             width="150">
-                Twist (begin/end)
-            </text>
-            <spinner
-             decimal_digits="0"
-             follows="left|top"
-             height="19"
-             increment="9"
-             initial_value="0"
-             label="B"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="180"
-             min_val="-180"
-             name="Twist Begin"
-             top_pad="4"
-             width="68" />
-            <spinner
-             decimal_digits="0"
-             follows="left|top"
-             height="19"
-             increment="9"
-             initial_value="0"
-             label="E"
-             label_width="10"
-             layout="topleft"
-             left_pad="10"
-             max_val="180"
-             min_val="-180"
-             name="Twist End"
-             top_delta="0"
-             width="68" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="scale_taper"
-             top_pad="3"
-             width="150">
-                Taper
-            </text>
-            <text
-			 visible="false"
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="scale_hole"
-             top_delta="0"
-             width="150">
-                Hole Size
-            </text>
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             label="X"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             min_val="-1"
-             name="Taper Scale X"
-             top_pad="4"
-             width="68" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             label="Y"
-             label_width="10"
-             layout="topleft"
-             left_pad="10"
-             min_val="-1"
-             name="Taper Scale Y"
-             top_delta="0"
-             width="68" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="text topshear"
-             top_pad="3"
-             width="141">
-                Top Shear
-            </text>
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             label="X"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="0.5"
-             min_val="-0.5"
-             name="Shear X"
-             top_pad="4"
-             width="68" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             label="Y"
-             label_width="10"
-             layout="topleft"
-             left_pad="10"
-             max_val="0.5"
-             min_val="-0.5"
-             name="Shear Y"
-             top_delta="0"
-             width="68" />
-            <text
-			 visible="false"
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="advanced_cut"
-             top_pad="3"
-             width="150">
-                Profile Cut (begin/end)
-            </text>
-            <text
-			 visible="false"
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="advanced_dimple"
-             top_delta="0"
-             width="150">
-                Dimple (begin/end)
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="advanced_slice"
-             top_delta="0"
-             width="150">
-                Slice (begin/end)
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.02"
-             initial_value="0"
-             label="B"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="0.98"
-             name="Path Limit Begin"
-             top_pad="3"
-             width="68" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.02"
-             initial_value="1"
-             label="E"
-             label_width="10"
-             layout="topleft"
-             left_pad="10"
-             min_val="0.02"
-             name="Path Limit End"
-             top_delta="0"
-             width="68" />
-            <text
-			 visible="false"
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="text taper2"
-             top_pad="3"
-             width="150">
-                Taper
-            </text>
-            <spinner
-			 visible="false"
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             label="X"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             min_val="-1"
-             name="Taper X"
-             top_pad="3"
-             width="68" />
-            <spinner
-			 visible="false"
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             label="Y"
-             label_width="10"
-             layout="topleft"
-             left_pad="10"
-             min_val="-1"
-             name="Taper Y"
-             top_delta="0"
-             width="68" />
-            <text
-			 visible="false"
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="text radius delta"
-             top_pad="2"
-             width="78">
-                Radius
-            </text>
-            <text
-			 visible="false"
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="78"
-             name="text revolutions"
-             width="68">
-                Revolutions
-            </text>
-            <spinner
-			 visible="false"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             layout="topleft"
-             left="125"
-             min_val="-1"
-             name="Radius Offset"
-             top_pad="4"
-             width="68" />
-            <spinner
-			 visible="false"
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             initial_value="1"
-             layout="topleft"
-             left_pad="10"
-             max_val="4"
-             min_val="1"
-             name="Revolutions"
-             top_delta="0"
-             width="68" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="141"
-             label="Sculpt Texture"
-             layout="topleft"
-             left="125"
-             name="sculpt texture control"
-             tool_tip="Click to choose a picture"
-             top="70"
-             visible="false"
-             width="145" />
-            <check_box
-             height="19"
-             label="Mirror"
-             layout="topleft"
-             left_delta="0"
-             name="sculpt mirror control"
-             tool_tip="Flips sculpted prim along the X axis"
-             top_pad="8"
-             visible="false"
-             width="130" />
-            <check_box
-             height="19"
-             label="Inside-out"
-             layout="topleft"
-             left_delta="0"
-             name="sculpt invert control"
-             tool_tip="Inverts the sculpted prims normals, making it appear inside-out"
-             top_pad="4"
-             visible="false"
-             width="121" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="label sculpt type"
-             top_pad="10"
-             visible="false"
-             width="130">
-                Stitching type
-            </text>
-            <combo_box
-             height="19"
-             layout="topleft"
-             left_delta="0"
-             name="sculpt type control"
-             top_pad="4"
-             visible="false"
-             width="150">
-                <combo_box.item
-                 label="(none)"
-                 name="None"
-                 value="None" />
-                <combo_box.item
-                 label="Sphere"
-                 name="Sphere"
-                 value="Sphere" />
-                <combo_box.item
-                 label="Torus"
-                 name="Torus"
-                 value="Torus" />
-                <combo_box.item
-                 label="Plane"
-                 name="Plane"
-                 value="Plane" />
-                <combo_box.item
-                 label="Cylinder"
-                 name="Cylinder"
-                 value="Cylinder" />
-            </combo_box>
-        </panel>
-        <panel
-         border="false"
-         follows="all"
-         height="367"
-         label="Features"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="toolbox_features_tab"
-         name="Features"
-         top_delta="0"
-         width="295">
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="20"
-             layout="topleft"
-             left="10"
-             name="select_single"
-             top="5"
-             width="252"
-             word_wrap="true">
-                Select only one primitive to edit features.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="edit_object"
-             top="5"
-             width="252">
-                Edit object features:
-            </text>
-            <check_box
-             height="19"
-             label="Flexible Path"
-             layout="topleft"
-             left="10"
-             name="Flexible1D Checkbox Ctrl"
-             tool_tip="Allows object to flex about the Z axis (Client-side only)"
-             top_pad="20"
-             width="121" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="1"
-             initial_value="2"
-             label="Softness"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="3"
-             name="FlexNumSections"
-             top_pad="10"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.5"
-             initial_value="0.3"
-             label="Gravity"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             min_val="-10"
-             name="FlexGravity"
-             top_pad="4"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.5"
-             initial_value="2"
-             label="Drag"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             name="FlexFriction"
-             top_pad="4"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.5"
-             initial_value="0"
-             label="Wind"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             name="FlexWind"
-             top_pad="4"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.5"
-             initial_value="1"
-             label="Tension"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             name="FlexTension"
-             top_pad="4"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Force X"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             min_val="-10"
-             name="FlexForceX"
-             top_pad="4"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Force Y"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             min_val="-10"
-             name="FlexForceY"
-             top_pad="4"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Force Z"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             min_val="-10"
-             name="FlexForceZ"
-             top_pad="4"
-             width="128" />
-            <check_box
-             height="16"
-             label="Light"
-             layout="topleft"
-             left="10"
-             name="Light Checkbox Ctrl"
-             tool_tip="Causes object to emit light"
-             top_pad="15"
-             width="60" />
-            <color_swatch
-             can_apply_immediately="true"
-             color="0.5 0.5 0.5 1"
-	     border.border_thickness="0"
-             follows="left|top"
-             height="50"
-             layout="topleft"
-             left_pad="10"
-             top_pad="-17"
-             name="colorswatch"
-             tool_tip="Click to open color picker"
-             width="40" />
-         <texture_picker
-            allow_no_texture="true"
-            top_delta="0"
-            can_apply_immediately="true"
-            default_image_name="Default"
-            follows="left|top"
-            height="48"
-            label=""
-            left_delta="57"
-            mouse_opaque="true"
-            name="light texture control"
-            tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)"
-            width="32" />
-          <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0.5"
-             label="Intensity"
-             label_width="70"
-             layout="topleft"
-             left="10"
-             name="Light Intensity"
-             top_pad="3"
-             width="128" />
-          <spinner bottom_delta="0"
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="16"
-                   increment="0.1"
-                   initial_value="0.5"
-                   label="FOV"
-                   label_width="55"
-                   left="144"
-                   max_val="3"
-                   min_val="0"
-                   mouse_opaque="true"
-                   name="Light FOV"
-                   width="120" />
-          <spinner follows="left|top"
-                   height="19"
-                   initial_value="5"
-                   label="Radius"
-                   label_width="70"
-                   layout="topleft"
-                   left="10"
-                   max_val="20"
-                   name="Light Radius"
-                   top_pad="3"
-                   width="128" />
-          <spinner bottom_delta="0"
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="16"
-                   increment="0.5"
-                   initial_value="0.5"
-                   label="Focus"
-                   label_width="55"
-                   left="144"
-                   max_val="20"
-                   min_val="-20"
-                   mouse_opaque="true"
-                   name="Light Focus"
-                   width="120" />
-          <spinner follows="left|top"
-                   height="19"
-                   increment="0.25"
-                   initial_value="1"
-                   label="Falloff"
-                   label_width="70"
-                   layout="topleft"
-                   left="10"
-                   max_val="2"
-                   name="Light Falloff"
-                   top_pad="3"
-                   width="128" />
-          <spinner bottom_delta="0"
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="16"
-                   increment="0.05"
-                   initial_value="1"
-                   label="Ambiance"
-                   label_width="55"
-                   left="144"
-                   max_val="1"
-                   min_val="0"
-                   mouse_opaque="true"
-                   name="Light Ambiance"
-                   width="120" />
-        </panel>
-         <panel
-         border="false"
-         follows="all"
-         height="367"
-         label="Texture"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="toolbox_texture_tab"
-         name="Texture"
-         top_delta="0"
-         width="295">
-            <panel.string
-             name="string repeats per meter">
-                Repeats Per Meter
-            </panel.string>
-            <panel.string
-             name="string repeats per face">
-                Repeats Per Face
-            </panel.string>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             fallback_image="locked_image.j2c"
-             follows="left|top"
-             height="80"
-             label="Texture"
-             layout="topleft"
-             left="10"
-             name="texture control"
-             tool_tip="Click to choose a picture"
-             top="8"
-             width="64" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="80"
-             label="Color"
-             layout="topleft"
-             left_pad="15"
-             name="colorswatch"
-             tool_tip="Click to open color picker"
-             top_delta="0"
-             width="64" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_pad="15"
-             name="color trans"
-             text_readonly_color="LabelDisabledColor"
-             top="6"
-             width="110">
-                Transparency %
-            </text>
-            <spinner
-             decimal_digits="0"
-             follows="left|top"
-             height="19"
-             increment="2"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             max_val="90"
-             name="ColorTrans"
-             top_pad="4"
-             width="80" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="glow label"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="8"
-             width="80">
-                Glow
-            </text>
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             name="glow"
-             top_pad="4"
-             width="80" />
-            <check_box
-             height="19"
-             label="Full Bright"
-             layout="topleft"
-             left_delta="-5"
-             name="checkbox fullbright"
-             top_pad="4"
-             width="81" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="tex gen"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="5"
-             width="90">
-                Mapping
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="combobox texgen"
-             top_pad="4"
-             width="90">
-                <combo_box.item
-                 label="Default"
-                 name="Default"
-                 value="Default" />
-                <combo_box.item
-                 label="Planar"
-                 name="Planar"
-                 value="Planar" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             name="label shininess"
-             left_pad="4"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="-37"
-             width="90">
-                Shininess
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="combobox shininess"
-             top_pad="4"
-             width="90">
-                <combo_box.item
-                 label="None"
-                 name="None"
-                 value="None" />
-                <combo_box.item
-                 label="Low"
-                 name="Low"
-                 value="Low" />
-                <combo_box.item
-                 label="Medium"
-                 name="Medium"
-                 value="Medium" />
-                <combo_box.item
-                 label="High"
-                 name="High"
-                 value="High" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_pad="4"
-             name="label bumpiness"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="-37"
-             width="90">
-                Bumpiness
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="combobox bumpiness"
-             top_pad="4"
-             width="90">
-                <combo_box.item
-                 label="None"
-                 name="None"
-                 value="None" />
-                <combo_box.item
-                 label="Brightness"
-                 name="Brightness"
-                 value="Brightness" />
-                <combo_box.item
-                 label="Darkness"
-                 name="Darkness"
-                 value="Darkness" />
-                <combo_box.item
-                 label="woodgrain"
-                 name="woodgrain"
-                 value="woodgrain" />
-                <combo_box.item
-                 label="bark"
-                 name="bark"
-                 value="bark" />
-                <combo_box.item
-                 label="bricks"
-                 name="bricks"
-                 value="bricks" />
-                <combo_box.item
-                 label="checker"
-                 name="checker"
-                 value="checker" />
-                <combo_box.item
-                 label="concrete"
-                 name="concrete"
-                 value="concrete" />
-                <combo_box.item
-                 label="crustytile"
-                 name="crustytile"
-                 value="crustytile" />
-                <combo_box.item
-                 label="cutstone"
-                 name="cutstone"
-                 value="cutstone" />
-                <combo_box.item
-                 label="discs"
-                 name="discs"
-                 value="discs" />
-                <combo_box.item
-                 label="gravel"
-                 name="gravel"
-                 value="gravel" />
-                <combo_box.item
-                 label="petridish"
-                 name="petridish"
-                 value="petridish" />
-                <combo_box.item
-                 label="siding"
-                 name="siding"
-                 value="siding" />
-                <combo_box.item
-                 label="stonetile"
-                 name="stonetile"
-                 value="stonetile" />
-                <combo_box.item
-                 label="stucco"
-                 name="stucco"
-                 value="stucco" />
-                <combo_box.item
-                 label="suction"
-                 name="suction"
-                 value="suction" />
-                <combo_box.item
-                 label="weave"
-                 name="weave"
-                 value="weave" />
-            </combo_box>
-          <!--
-            <line_editor
-             bevel_style="in"
-             border_style="line"
-             border_thickness="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="10"
-             max_length_bytes="63"
-             name="Home Url"
-             select_on_focus="true"
-             top="134"
-             width="250" />
-            <check_box
-             height="16"
-             label="Media Face"
-             layout="topleft"
-             left_delta="0"
-             name="has media"
-             top_pad="6"
-             width="70" />
-            <button
-             follows="left|top"
-             font="SansSerifSmall"
-             height="20"
-             label="Set Media Info"
-             label_selected="Set Media Info"
-             layout="topleft"
-             left_pad="60"
-             name="media info set"
-             top_delta="-4"
-             width="120" />
--->
-            <check_box
-             follows="top|left"
-             height="16"
-             initial_value="false"
-             label="Align planar faces"
-             layout="topleft"
-             left="17"
-             name="checkbox planar align"
-             tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
-             top_delta="26"
-             width="140" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="rpt"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="2"
-             width="140">
-                Repeats / Face
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Horizontal (U)"
-             label_width="125"
-             layout="topleft"
-             left="20"
-             max_val="100"
-             name="TexScaleU"
-             top_pad="5"
-             width="185" />
-            <check_box
-             height="19"
-             label="Flip"
-             layout="topleft"
-             left_pad="5"
-             name="checkbox flip s"
-             top_delta="0"
-             width="70" />
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Vertical (V)"
-             label_width="125"
-             layout="topleft"
-             left="20"
-             max_val="100"
-             name="TexScaleV"
-             width="185" />
-            <check_box
-             height="19"
-             label="Flip"
-             layout="topleft"
-             left_pad="5"
-             name="checkbox flip t"
-             top_delta="0"
-             width="70" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="1"
-             initial_value="0"
-			 label="Rotation˚"
-             layout="topleft"
-			 label_width="135"
-             left="10"
-             max_val="9999"
-             min_val="-9999"
-             name="TexRot"
-             width="195" />
-
-            <spinner
-             decimal_digits="1"
-             follows="left|top"
-             height="23"
-             initial_value="1"
-			 label="Repeats / Meter"
-             layout="topleft"
-			 label_width="135"
-             left="10"
-             max_val="10"
-             min_val="0.1"
-             name="rptctrl"
-             width="195" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Apply"
-             label_selected="Apply"
-             layout="topleft"
-             left_pad="5"
-             name="button apply"
-             width="75" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="tex offset"
-             text_readonly_color="LabelDisabledColor"
-             width="200">
-                Texture Offset
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Horizontal (U)"
-             label_width="125"
-             layout="topleft"
-             left="20"
-             min_val="-1"
-             name="TexOffsetU"
-             width="185" />
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Vertical (V)"
-             label_width="125"
-             layout="topleft"
-             left_delta="0"
-             min_val="-1"
-             name="TexOffsetV"
-             top_pad="1"
-             width="185" />
-        <panel
-         border="false"
-         follows="left|top"
-         layout="topleft"
-         mouse_opaque="false"
-         background_visible="true"
-         bg_alpha_color="DkGray"
-         name="Add_Media"
-         left="0"
-         height="47"
-         width="290">
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="18"
-             layout="topleft"
-             left="10"
-             top_pad="3"
-             name="media_tex"
-             width="190">
-              Media
-			</text>
-			<button
-			 follows="top|left"
-			 height="18"
-			 image_selected="AddItem_Press"
-			 image_unselected="AddItem_Off"
-			 image_disabled="AddItem_Disabled"
-			 layout="topleft"
-			 left_pad="0"
-			 name="add_media"
-			 tab_stop="false"
-			 top_delta="0"
-			 tool_tip="Add Media"
-			 width="18">
-				<button.commit_callback
-				function="BuildTool.AddMedia"/>
-			</button>
-			<button
-			 follows="top|left"
-			 height="18"
-			 image_selected="TrashItem_Press"
-			 image_unselected="TrashItem_Off"
-			 layout="topleft"
-			 left_pad="5"
-			 name="delete_media"
-			 tool_tip="Delete this media texture"
-			 top_delta="0"
-			 width="18">
-				<button.commit_callback
-				function="BuildTool.DeleteMedia"/>
-			</button>
-			<button
-			 follows="top|left"
-			 tool_tip="Edit this Media"
-			 height="12"
-             image_disabled="Icon_Gear_Background"
-             image_selected="Icon_Gear_Press"
-             image_unselected="Icon_Gear_Foreground"
-			 layout="topleft"
-			 left_pad="10"
-			 name="edit_media"
-			 top_delta="3"
-			 width="12">
-				<button.commit_callback
-				function="BuildTool.EditMedia"/>
-			</button>
-      <text
-			 follows="left|top|right"
-			 height="9"
-			 layout="topleft"
-			 left="10"
-                         use_ellipses="true"
-			 read_only="true"
-			 name="media_info"
-			 width="280" />
-      <web_browser
-        visible="false"
-        enabled="false"
-        border_visible="true"
-        bottom_delta="0"
-        follows="top|left"
-        left="0"
-        name="title_media"
-        width="4"
-        height="4"
-        start_url="about:blank"
-        decouple_texture_size="true" />
-     <button
-			 follows="right|top"
-			 height="22"
-			 label="Align"
-			 label_selected="Align Media"
-			 layout="topleft"
-			 right="-16"
-			 name="button align"
-			 top_delta="-4"
-			 tool_tip="Align media texture (must load first)"
-			 width="80" />
-		</panel>
-	   </panel>
-       <panel
-         border="false"
-         follows="all"
-         label="Content"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="toolbox_contents_tab"
-         name="Contents"
-         top_delta="0"
-         width="295">
-            <button
-             follows="left|top"
-             height="23"
-             label="New Script"
-             label_selected="New Script"
-             layout="topleft"
-             left="10"
-             name="button new script"
-             top="10"
-             width="134" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Permissions"
-             layout="topleft"
-             left_pad="8"
-             name="button permissions"
-             width="134" />
-            <panel_inventory_object
-             border="true"
-             border_visible="true"
-             bevel_style="in"
-             follows="left|top|right"
-             height="325"
-             layout="topleft"
-             left="10"
-             name="contents_inventory"
-             top="50"
-             width="275" />
-		</panel>
-        </tab_container>
-	<panel
-	 follows="left|top"
-     height="384"
-     layout="topleft"
-     left_delta="0"
-     name="land info panel"
-     top_delta="0"
-     width="295">
-    <text
-         type="string"
-         length="1"
-         font="SansSerifBig"
-         follows="left|top"
-         height="19"
-         layout="topleft"
-         left="20"
-         name="label_parcel_info"
-         top="24"
-         width="240">
-            Parcel Information
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="19"
-         layout="topleft"
-         left="30"
-         name="label_area_price"
-         top="48"
-         width="150">
-            Price: L$[PRICE] for [AREA] m²
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="19"
-         layout="topleft"
-         left_delta="0"
-         name="label_area"
-         top_delta="0"
-         width="150">
-            Area: [AREA] m²
-        </text>
-        <button
-         follows="left|top"
-         height="23"
-         label="About Land"
-         label_selected="About Land"
-         layout="topleft"
-         left_delta="0"
-         name="button about land"
-         top_pad="4"
-         width="125" />
-        <check_box
-         control_name="ShowParcelOwners"
-         height="19"
-         label="Show owners"
-         layout="topleft"
-         left_delta="0"
-         name="checkbox show owners"
-         tool_tip="Colorize the parcels according to the type of owner: &#10;&#10;Green = Your land &#10;Aqua = Your group&apos;s land &#10;Red = Owned by others &#10;Yellow = For sale &#10;Purple = For auction &#10;Grey = Public"
-         top_pad="8"
-         width="205" />
-        <text
-         type="string"
-         length="1"
-         font="SansSerifBig"
-         follows="left|top"
-         height="19"
-         layout="topleft"
-         left="20"
-         name="label_parcel_modify"
-         top="152"
-         width="240">
-            Modify Parcel
-        </text>
-        <button
-         follows="left|top"
-         height="23"
-         label="Subdivide"
-         label_selected="Subdivide"
-         layout="topleft"
-         left="30"
-         name="button subdivide land"
-         top="172"
-         width="125" />
-        <button
-         follows="left|top"
-         height="23"
-         label="Join"
-         label_selected="Join"
-         layout="topleft"
-         left_delta="0"
-         name="button join land"
-         top_pad="4"
-         width="125" />
-        <text
-         type="string"
-         length="1"
-         font="SansSerifBig"
-         follows="left|top"
-         height="19"
-         layout="topleft"
-         left="20"
-         name="label_parcel_trans"
-         top="256"
-         width="240">
-            Land Transactions
-        </text>
-        <button
-         follows="left|top"
-         height="23"
-         label="Buy Land"
-         label_selected="Buy Land"
-         layout="topleft"
-         left="30"
-         name="button buy land"
-         top="276"
-         width="125" />
-        <button
-         follows="left|top"
-         height="23"
-         label="Abandon Land"
-         label_selected="Abandon Land"
-         layout="topleft"
-         left_delta="0"
-         name="button abandon land"
-         top_pad="4"
-         width="125" />
- </panel>
-<!-- end of tabs -->
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+ legacy_header_height="18"

+ follows="left|top|right"

+ height="580"

+ layout="topleft"

+ bg_opaque_image="Window_NoTitle_Foreground"

+ bg_alpha_image="Window_NoTitle_Background"

+ name="toolbox floater"

+ help_topic="toolbox_floater"

+ save_rect="true"

+ short_title="BUILD TOOLS"

+ single_instance="true"

+ save_visibility="true"

+ sound_flags="0"

+ width="295">

+    <floater.string

+     name="status_rotate">

+        Drag colored bands to rotate object

+    </floater.string>

+    <floater.string

+     name="status_scale">

+        Click and drag to stretch selected side

+    </floater.string>

+    <floater.string

+     name="status_move">

+        Drag to move, shift-drag to copy

+    </floater.string>

+    <floater.string

+     name="status_modifyland">

+        Click and hold to modify land

+    </floater.string>

+    <floater.string

+     name="status_camera">

+        Click and drag to move camera

+    </floater.string>

+    <floater.string

+     name="status_grab">

+        Drag to move, Ctrl to lift, Ctrl+Shift to rotate

+    </floater.string>

+    <floater.string

+     name="status_place">

+        Click inworld to build

+    </floater.string>

+    <floater.string

+     name="status_selectland">

+        Click and drag to select land

+    </floater.string>

+    <floater.string

+     name="grid_screen_text">

+        Screen

+    </floater.string>

+    <floater.string

+     name="grid_local_text">

+        Local

+    </floater.string>

+    <floater.string

+     name="grid_world_text">

+        World

+    </floater.string>

+    <floater.string

+     name="grid_reference_text">

+        Reference

+    </floater.string>

+    <floater.string

+     name="grid_attachment_text">

+        Attachment

+    </floater.string>

+    <button

+     follows="left|top"

+     height="25"

+     image_bottom_pad="1"

+     image_overlay="Tool_Zoom"

+     image_selected="PushButton_Selected_Press"

+     layout="topleft"

+     left="10"

+     name="button focus"

+     tool_tip="Focus"

+     width="35">

+	  <button.commit_callback

+	     function="BuildTool.setTool"

+	     parameter="Focus" />

+	</button>

+    <button

+     follows="left|top"

+      height="25"

+     image_bottom_pad="1"

+     image_overlay="Tool_Grab"

+     image_selected="PushButton_Selected_Press"

+     layout="topleft"

+     left_pad="10"

+     name="button move"

+     tool_tip="Move"

+     width="35">

+	  <button.commit_callback

+	     function="BuildTool.setTool"

+	     parameter="Move" />

+	</button>

+    <button

+     follows="left|top"

+     height="25"

+     image_bottom_pad="1"

+     image_overlay="Tool_Face"

+     image_selected="PushButton_Selected_Press"

+     layout="topleft"

+     left_pad="10"

+     name="button edit"

+     tool_tip="Edit"

+     width="35">

+	  <button.commit_callback

+	     function="BuildTool.setTool"

+	     parameter="Edit" />

+	</button>

+    <button

+     follows="left|top"

+      height="25"

+     image_bottom_pad="1"

+     image_overlay="Tool_Create"

+     image_selected="PushButton_Selected_Press"

+     layout="topleft"

+     left_pad="10"

+     name="button create"

+     tool_tip="Create"

+     width="35">

+	  <button.commit_callback

+	     function="BuildTool.setTool"

+	     parameter="Create" />

+	</button>

+    <button

+     follows="left|top"

+      height="25"

+     image_bottom_pad="1"

+     image_overlay="Tool_Dozer"

+     image_selected="PushButton_Selected_Press"

+     layout="topleft"

+     left_pad="10"

+     name="button land"

+     tool_tip="Land"

+     width="35">

+	  <button.commit_callback

+	     function="BuildTool.setTool"

+	     parameter="Land" />

+	</button>

+    <text

+     height="30"

+     word_wrap="true"

+     use_ellipses="true"

+     type="string"

+     text_color="LabelSelectedDisabledColor"

+     length="1"

+     follows="left|top"

+     layout="topleft"

+     left="8"

+     name="text status"

+     top_pad="3"

+     width="285">

+        Drag to move, shift-drag to copy

+    </text>

+   <radio_group

+     layout="topleft"

+     left="10"

+      height="70"

+      top="59"

+     name="focus_radio_group">

+        <radio_item

+         top_pad="6"

+         label="Zoom"

+         layout="topleft"

+         name="radio zoom" />

+        <radio_item

+         top_pad="6"

+         label="Orbit (Ctrl)"

+         layout="topleft"

+         name="radio orbit" />

+        <radio_item

+         top_pad="6"

+         label="Pan (Ctrl+Shift)"

+         layout="topleft"

+         name="radio pan" />

+		 <radio_group.commit_callback

+	     function="BuildTool.commitRadioFocus"/>

+    </radio_group>

+   <slider_bar

+     follows="left|top"

+     height="14"

+     increment="0.01"

+     initial_value="0.125"

+     layout="topleft"

+     max_val="0.5"

+     top_delta="-2"

+     left_delta="100"

+     name="slider zoom"

+     width="134">

+	 <slider_bar.commit_callback

+	     function="BuildTool.commitZoom"/>

+	</slider_bar>

+   <radio_group

+      left="10"

+      height="70"

+      top="59"

+     layout="topleft"

+     name="move_radio_group">

+        <radio_item

+         top_pad="6"

+         label="Move"

+         layout="topleft"

+         name="radio move" />

+        <radio_item

+		 top_pad="6"

+         label="Lift (Ctrl)"

+         layout="topleft"

+         name="radio lift" />

+        <radio_item

+         top_pad="6"

+         label="Spin (Ctrl+Shift)"

+         layout="topleft"

+         name="radio spin" />

+		 <radio_group.commit_callback

+			function="BuildTool.commitRadioMove"/>

+	</radio_group>

+	<radio_group

+     follows="left|top"

+	 left="5"

+	 top="59"

+	 height="70"

+     layout="topleft"

+	 name="edit_radio_group">

+        <radio_item

+		 label="Move"

+		 layout="topleft"

+		 name="radio position" />

+        <radio_item

+		 top_pad="6"

+         label="Rotate (Ctrl)"

+         layout="topleft"

+         name="radio rotate" />

+        <radio_item

+		 top_pad="6"

+         label="Stretch (Ctrl+Shift)"

+         layout="topleft"

+         name="radio stretch" />

+        <radio_item

+		 top_pad="6"

+         label="Select Face"

+         layout="topleft"

+         name="radio select face" />

+			<radio_group.commit_callback

+			function="BuildTool.commitRadioEdit"/>

+    </radio_group>

+    <check_box

+     left="5"

+     follows="left|top"

+     height="28"

+	 control_name="EditLinkedParts"

+     label="Edit linked"

+     layout="topleft"

+     name="checkbox edit linked parts"

+     top_pad="-10">

+		  <check_box.commit_callback

+			function="BuildTool.selectComponent"/>

+	</check_box>

+

+   <button

+     follows="left|top"

+     height="23"

+     label="Link"

+     top_pad="2"

+     layout="topleft"

+     left="5"

+     name="link_btn"

+     width="50">

+	  <button.commit_callback

+	     function="BuildTool.LinkObjects"/>

+    </button>

+    <button

+     follows="left|top"

+     height="23"

+     label="Unlink"

+     layout="topleft"

+     left_pad="2"

+     name="unlink_btn"

+     width="50">

+	  <button.commit_callback

+	     function="BuildTool.UnlinkObjects"/>

+    </button>

+    <text

+	   text_color="LtGray_50"

+	   follows="top|left"

+	   halign="left"

+	   left_pad="3"

+	   name="RenderingCost"

+	   tool_tip="Shows the rendering cost calculated for this object"

+	   top_delta="11"

+	   type="string"

+	   width="100">

+	   þ: [COUNT]

+	   </text>

+    <check_box

+     control_name="ScaleUniform"

+     height="19"

+     label=""

+     layout="topleft"

+     left="143"

+     name="checkbox uniform"

+     top="50"

+     width="20" />

+    <text

+     height="19"

+     label="Stretch Both Sides"

+     left_delta="20"

+     name="checkbox uniform label"

+     top_delta="2"

+     width="120"

+     layout="topleft"

+     follows="top|left"

+     wrap="true">

+     	Stretch Both Sides

+    </text>

+    <check_box

+     control_name="ScaleStretchTextures"

+     height="19"

+     initial_value="true"

+     label="Stretch Textures"

+     layout="topleft"

+     left="143"

+     name="checkbox stretch textures"

+     top_pad="-6"

+     follows="left|top"

+     width="134" />

+   <check_box

+     control_name="SnapEnabled"

+     height="18"

+     initial_value="true"

+     label="Snap to grid"

+     layout="topleft"

+     top_pad="0"

+     name="checkbox snap to grid"

+     width="134" />

+    <combo_box

+     height="23"

+     layout="topleft"

+     follows="left|top"

+     name="combobox grid mode"

+     tool_tip="Choose the type of grid ruler for positioning the object"

+     top_pad="0"

+     width="108">

+        <combo_box.item

+         label="World grid"

+         name="World"

+         value="World" />

+        <combo_box.item

+         label="Local grid"

+         name="Local"

+         value="Local" />

+        <combo_box.item

+         label="Reference grid"

+         name="Reference"

+         value="Reference" />

+		 <combo_box.commit_callback

+	     function="BuildTool.gridMode"/>

+    </combo_box>

+    <button

+     left_pad="0"

+     image_selected="ForwardArrow_Press"

+     image_unselected="ForwardArrow_Off"

+     layout="topleft"

+     follows="top|left"

+     name="Options..."

+     tool_tip="See more grid options"

+     top_pad="-22"

+     right="-10"

+     width="18"

+     height="23" >

+	 <button.commit_callback

+	     function="BuildTool.gridOptions"/>

+	</button>

+   <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Cube"

+     image_disabled_selected="Object_Cube"

+     image_selected="Object_Cube_Selected"

+     image_unselected="Object_Cube"

+     layout="topleft"

+     left="10"

+     name="ToolCube"

+     tool_tip="Cube"

+     top="51"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Prism"

+     image_disabled_selected="Object_Prism"

+     image_selected="Object_Prism_Selected"

+     image_unselected="Object_Prism"

+     layout="topleft"

+     left_delta="29"

+     name="ToolPrism"

+     tool_tip="Prism"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Pyramid"

+     image_disabled_selected="Object_Pyramid"

+     image_selected="Object_Pyramid_Selected"

+     image_unselected="Object_Pyramid"

+     layout="topleft"

+     left_delta="29"

+     name="ToolPyramid"

+     tool_tip="Pyramid"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Tetrahedron"

+     image_disabled_selected="Object_Tetrahedron"

+     image_selected="Object_Tetrahedron_Selected"

+     image_unselected="Object_Tetrahedron"

+     layout="topleft"

+     left_delta="29"

+     name="ToolTetrahedron"

+     tool_tip="Tetrahedron"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Cylinder"

+     image_disabled_selected="Object_Cylinder"

+     image_selected="Object_Cylinder_Selected"

+     image_unselected="Object_Cylinder"

+     layout="topleft"

+     left_delta="29"

+     name="ToolCylinder"

+     tool_tip="Cylinder"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Hemi_Cylinder"

+     image_disabled_selected="Object_Hemi_Cylinder"

+     image_selected="Object_Hemi_Cylinder_Selected"

+     image_unselected="Object_Hemi_Cylinder"

+     layout="topleft"

+     left_delta="29"

+     name="ToolHemiCylinder"

+     tool_tip="Hemicylinder"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Cone"

+     image_disabled_selected="Object_Cone"

+     image_selected="Object_Cone_Selected"

+     image_unselected="Object_Cone"

+     layout="topleft"

+     left_delta="29"

+     name="ToolCone"

+     tool_tip="Cone"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Hemi_Cone"

+     image_disabled_selected="Object_Hemi_Cone"

+     image_selected="Object_Hemi_Cone_Selected"

+     image_unselected="Object_Hemi_Cone"

+     layout="topleft"

+     left_delta="29"

+     name="ToolHemiCone"

+     tool_tip="Hemicone"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Sphere"

+     image_disabled_selected="Object_Sphere"

+     image_selected="Object_Sphere_Selected"

+     image_unselected="Object_Sphere"

+     layout="topleft"

+     left_delta="29"

+     name="ToolSphere"

+     tool_tip="Sphere"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Hemi_Sphere"

+     image_disabled_selected="Object_Hemi_Sphere"

+     image_selected="Object_Hemi_Sphere_Selected"

+     image_unselected="Object_Hemi_Sphere"

+     layout="topleft"

+     left_delta="29"

+     name="ToolHemiSphere"

+     tool_tip="Hemisphere"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Torus"

+     image_disabled_selected="Object_Torus"

+     image_selected="Object_Torus_Selected"

+     image_unselected="Object_Torus"

+     layout="topleft"

+     left="10"

+     name="ToolTorus"

+     tool_tip="Torus"

+     top="77"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Tube"

+     image_disabled_selected="Object_Tube"

+     image_selected="Object_Tube_Selected"

+     image_unselected="Object_Tube"

+     layout="topleft"

+     left_delta="29"

+     name="ToolTube"

+     tool_tip="Tube"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Ring"

+     image_disabled_selected="Object_Ring"

+     image_selected="Object_Ring_Selected"

+     image_unselected="Object_Ring"

+     layout="topleft"

+     left_delta="29"

+     name="ToolRing"

+     tool_tip="Ring"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Tree"

+     image_disabled_selected="Object_Tree"

+     image_selected="Object_Tree_Selected"

+     image_unselected="Object_Tree"

+     layout="topleft"

+     left_delta="29"

+     name="ToolTree"

+     tool_tip="Tree"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Grass"

+     image_disabled_selected="Object_Grass"

+     image_selected="Object_Grass_Selected"

+     image_unselected="Object_Grass"

+     image_overlay_color="Red"

+     layout="topleft"

+     left_delta="29"

+     name="ToolGrass"

+     tool_tip="Grass"

+     top_delta="0"

+     width="20" />

+    <check_box

+     control_name="CreateToolKeepSelected"

+     height="19"

+     label="Keep Tool selected"

+     layout="topleft"

+     left="4"

+     name="checkbox sticky"

+     top="101"

+     width="128" />

+    <check_box

+     control_name="CreateToolCopySelection"

+     height="19"

+     label="Copy selection"

+     layout="topleft"

+     left_delta="0"

+     name="checkbox copy selection"

+     top_delta="15"

+     width="134" />

+    <check_box

+     control_name="CreateToolCopyCenters"

+     height="19"

+     initial_value="true"

+     label="Center Copy"

+     layout="topleft"

+     left_delta="18"

+     name="checkbox copy centers"

+     top="132"

+     width="134" />

+    <check_box

+     control_name="CreateToolCopyRotates"

+     height="19"

+     label="Rotate Copy"

+     layout="topleft"

+     left_delta="0"

+     name="checkbox copy rotates"

+     top_delta="16"

+     width="134" />

+    <radio_group

+     height="105"

+     layout="topleft"

+     left="4"

+     name="land_radio_group"

+     top="54"

+     width="114">

+        <radio_item

+         height="19"

+         label="Select Land"

+         layout="topleft"

+         left="0"

+         name="radio select land"

+         top="-106"

+         width="134" />

+        <radio_item

+         height="19"

+         label="Flatten"

+         layout="topleft"

+         left_delta="0"

+         name="radio flatten"

+         top_delta="15"

+         width="114" />

+        <radio_item

+         height="19"

+         label="Raise"

+         layout="topleft"

+         left_delta="0"

+         name="radio raise"

+         top_delta="15"

+         width="114" />

+        <radio_item

+         height="19"

+         label="Lower"

+         layout="topleft"

+         left_delta="0"

+         name="radio lower"

+         top_delta="15"

+         width="114" />

+        <radio_item

+         height="19"

+         label="Smooth"

+         layout="topleft"

+         left_delta="0"

+         name="radio smooth"

+         top_delta="15"

+         width="114" />

+        <radio_item

+         height="19"

+         label="Roughen"

+         layout="topleft"

+         left_delta="0"

+         name="radio noise"

+         top_delta="15"

+         width="114" />

+        <radio_item

+         height="19"

+         label="Revert"

+         layout="topleft"

+         left_delta="0"

+         name="radio revert"

+         top_delta="15"

+         width="114" />

+		 <radio_group.commit_callback

+	     function="BuildTool.commitRadioLand"/>

+    </radio_group>

+    <text

+     type="string"

+     length="1"

+     follows="left|top"

+     height="12"

+     layout="topleft"

+     left="135"

+     name="Bulldozer:"

+     top="57"

+     width="100">

+        Bulldozer:

+    </text>

+    <text

+     type="string"

+     length="1"

+     follows="left|top"

+     height="12"

+     layout="topleft"

+     name="Dozer Size:"

+     left="135"

+     top_pad="5"

+     width="50">

+        Size

+    </text>

+    <slider_bar

+	 control_name ="LandBrushSize"

+     follows="left|top"

+     height="19"

+     initial_value="2.0"

+     layout="topleft"

+     max_val="11"

+     min_val="1"

+     left_pad="0"

+     name="slider brush size"

+     top_delta="-3"

+     width="80" />

+    <text

+     type="string"

+     length="1"

+     follows="left|top"

+     height="12"

+     layout="topleft"

+     name="Strength:"

+     left="135"

+     top_pad="5"

+     width="50">

+        Strength

+    </text>

+    <slider_bar

+     follows="left|top"

+     height="19"

+     left_pad="0"

+     initial_value="0.00"

+     layout="topleft"

+     max_val="2"

+     min_val="-1"

+     name="slider force"

+     top_delta="-3"

+     width="80" >

+	  <slider_bar.commit_callback

+	     function="BuildTool.LandBrushForce"/>

+    </slider_bar>

+    <button

+     follows="left|top"

+     height="23"

+     label="Apply"

+     label_selected="Apply"

+     top_pad="5"

+     layout="topleft"

+     left="135"

+     name="button apply to selection"

+     tool_tip="Modify selected land"

+     width="82">

+	  <button.commit_callback

+	     function="BuildTool.applyToSelection"/>

+    </button>

+	<text

+	 text_color="LtGray_50"

+	  type="string"

+	  length="1"

+	  height="10"

+	  follows="left|top"

+	  halign="right"

+	  layout="topleft"

+	  right="-10"

+	  name="obj_count"

+	  top_pad="5"

+	  width="143">

+		Objects: [COUNT]

+	</text>

+	<text

+    text_color="LtGray_50"

+     type="string"

+     length="1"

+	height="10" 

+     follows="left|top"

+     halign="right"

+     layout="topleft"

+     right="-10"

+     name="prim_count"

+     width="143">

+		Prims: [COUNT]

+	</text>

+    <text

+    text_color="LtGray_50"

+     type="string"

+     length="1"

+     height="10"

+     follows="left|top"

+     halign="right"

+     layout="topleft"

+     right="-120"

+     name="linked_set_count"

+     top="144"

+     width="80">

+        Linked Sets: [COUNT]

+    </text>

+    <text

+    text_color="LtGray_50"

+     type="string"

+     length="1"

+     height="10"

+     follows="left|top"

+     halign="right"

+     layout="topleft"

+     top_delta="0"

+     right="-8"

+     name="linked_set_cost"

+     tool_tip="Cost of currently selected linked sets as [prims],[physics complexity]" 

+     width="80">

+        Cost: [COST] / [PHYSICS]

+    </text>

+    <text

+    text_color="LtGray_50"

+     type="string"

+     length="1"

+     follows="left|top"

+     halign="right"

+     layout="topleft"

+     top_pad="5"

+     right="-120"

+     name="object_count"

+     width="80">

+        Objects: [COUNT]

+    </text>

+    <text

+    text_color="LtGray_50"

+     type="string"

+     length="1"

+     follows="left|top"

+     halign="right"

+     layout="topleft"

+	 top_delta="0"

+     right="-8"

+     name="object_cost"

+     tool_tip="Cost of currently selected objects as [prims] / [physics complexity]"

+     width="80">

+        Cost: [COST] / [PHYSICS]

+    </text>

+    <!-- <text -->

+    <!-- text_color="LtGray_50" -->

+    <!--  type="string" -->

+    <!--  length="1" -->

+    <!--  height="10" -->

+    <!--  follows="left|top" -->

+    <!--  halign="right" -->

+    <!--  layout="topleft" -->

+    <!--  right="-10" -->

+    <!--  name="obj_count" -->

+    <!--  top_pad="5" -->

+    <!--  width="143"> -->

+    <!--     Objects: [COUNT] -->

+    <!-- </text> -->

+    <!-- <text -->

+    <!-- text_color="LtGray_50" -->

+    <!--  type="string" -->

+    <!--  length="1" -->

+    <!--  follows="left|top" -->

+    <!--  halign="right" -->

+    <!--  layout="topleft" -->

+    <!--  right="-10" -->

+    <!--  name="prim_count" -->

+    <!--  width="143"> -->

+    <!--     Prims: [COUNT] -->

+    <!-- </text> -->

+    <tab_container

+     follows="left|top"

+     height="410"

+     halign="center"

+     left="0"

+     name="Object Info Tabs"

+     tab_max_width="100"

+     tab_min_width="40"

+     tab_position="top"

+     tab_height="25"

+     top="173"

+     width="295">

+	

+<panel

+	 border="false"

+	 follows="all"

+	 label="General"

+	 layout="topleft"

+	 mouse_opaque="false"

+	 help_topic="toolbox_general_tab"

+	 name="General"

+	 top="16"

+	 width="295">

+	 <panel.string

+	  name="text deed continued">

+		Deed

+	 </panel.string>

+	<panel.string

+	 name="text deed">

+		Deed

+	</panel.string>

+            <panel.string

+             name="text modify info 1">

+                You can modify this object

+            </panel.string>

+            <panel.string

+             name="text modify info 2">

+                You can modify these objects

+            </panel.string>

+            <panel.string

+             name="text modify info 3">

+                You can't modify this object

+            </panel.string>

+            <panel.string

+             name="text modify info 4">

+                You can't modify these objects

+            </panel.string>

+            <panel.string

+             name="text modify warning">

+                You must select entire object to set permissions

+            </panel.string>

+            <panel.string

+             name="Cost Default">

+                Price: L$

+            </panel.string>

+            <panel.string

+             name="Cost Total">

+                Total Price: L$

+            </panel.string>

+            <panel.string

+             name="Cost Per Unit">

+                Price Per: L$

+            </panel.string>

+            <panel.string

+             name="Cost Mixed">

+                Mixed Price

+            </panel.string>

+            <panel.string

+             name="Sale Mixed">

+                Mixed Sale

+            </panel.string>

+            <text

+             follows="left|top"

+             height="10"

+             left="10"

+             name="Name:"

+             top="5"

+             width="90">

+                Name:

+            </text>

+            <line_editor

+             follows="left|top|right"

+             height="19"

+             left_pad="0"

+             max_length_bytes="63"

+             name="Object Name"

+             select_on_focus="true"

+             top_delta="0"

+             width="170" />

+            <text

+             follows="left|top"

+             height="10"

+             left="10"

+             name="Description:"

+             top_pad="3"

+             width="90">

+                Description:

+            </text>

+            <line_editor

+             follows="left|top|right"

+             height="19"

+             left_pad="0"

+             max_length_bytes="127"

+             name="Object Description"

+             select_on_focus="true"

+             top_delta="0"

+             width="170" />

+            <text

+             type="string"

+             left="10"

+             length="1"

+             follows="left|top"

+             height="19"

+             layout="topleft"

+             name="Creator:"

+             top_pad="7"

+             width="90">

+                Creator:

+            </text>

+            <!-- *NOTE: Intentionally wide for long names -->

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             left_pad="0"

+             height="20"

+             layout="topleft"

+             name="Creator Name"

+             top_delta="0"

+             translate="false"

+             width="190"

+             word_wrap="true"

+             use_ellipses="true">

+                TestString PleaseIgnore (please.ignore)

+            </text>

+            <text

+             type="string"

+             length="1"

+             left="10"

+             follows="left|top"

+             height="19"

+             layout="topleft"

+             name="Owner:"

+             top_pad="13"

+             width="90">

+                Owner:

+            </text>

+            <!-- *NOTE: Intentionally wide for long names -->

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="20"

+             layout="topleft"

+             name="Owner Name"

+             left_pad="0"

+             top_delta="0"

+             translate="false"

+             width="190"

+             word_wrap="true"

+             use_ellipses="true">

+                TestString PleaseIgnore (please.ignore)

+            </text>

+           <text

+             type="string"

+             length="1"

+             follows="left|top"

+             layout="topleft"

+             left="10"

+             height="18"

+             name="Group:"

+             top_pad="17"

+             width="75">

+                Group:

+            </text>

+            <name_box

+             follows="left|top"

+             height="18"

+             initial_value="Loading..."

+             layout="topleft"

+             left_pad="23"

+             name="Group Name Proxy"

+             width="142" />

+            <button

+			 follows="top|left"

+			 height="23"

+			 image_overlay="Edit_Wrench"

+			 layout="topleft"

+			 left_pad="13"

+			 name="button set group"

+			 tab_stop="false"

+			 tool_tip="Choose a group to share this object's permissions"

+			 width="23" />

+            <check_box

+             height="19"

+             follows="left|top"

+             label="Share"

+             layout="topleft"

+             name="checkbox share with group"

+             tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."

+             top_pad="10"

+             left="100"

+             width="87" />

+            <button

+             follows="top|left"

+             height="23"

+             label="Deed"

+             label_selected="Deed"

+             layout="topleft"

+             name="button deed"

+             left_pad="19"

+             tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."

+             width="80" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="16"

+             layout="topleft"

+             top_pad="10"

+             left="10"

+             name="label click action"

+             width="118">

+                Click to:

+            </text>

+            <combo_box

+             follows="left|top"

+             height="23"

+             layout="topleft"

+             name="clickaction"

+             width="148"

+             left_pad="10">

+                <combo_box.item

+                 label="Touch  (default)"

+                 name="Touch/grab(default)"

+                 value="Touch" />

+                <combo_box.item

+                 label="Sit on object"

+                 name="Sitonobject"

+                 value="Sit" />

+                <combo_box.item

+                 label="Buy object"

+                 name="Buyobject"

+                 value="Buy" />

+                <combo_box.item

+                 label="Pay object"

+                 name="Payobject"

+                 value="Pay" />

+                <combo_box.item

+                 label="Open"

+                 name="Open"

+                 value="Open" />

+				 <combo_box.item

+                 label="Zoom"

+                 name="Zoom"

+                 value="Zoom" />

+            </combo_box>

+            <check_box

+             height="23"

+             label="For Sale:"

+             layout="topleft"

+             name="checkbox for sale"

+             left="7"

+             width="100" />

+<!-- NEW SALE TYPE COMBO BOX -->

+      <combo_box

+            left_pad="10"

+            layout="topleft"

+            follows="left|top"

+            allow_text_entry="false"

+            height="23"

+            initial_value="2"

+            max_chars="20"

+            mouse_opaque="true"

+            name="sale type"

+            width="168">

+        <combo_box.item

+           name="Copy"

+           label="Copy"

+           value="2" />

+        <combo_box.item

+           name="Contents"

+           label="Contents"

+           value="3" />

+        <combo_box.item

+           name="Original"

+           label="Original"

+           value="1" />

+      </combo_box>

+<!-- NEW PRICE SPINNER

+Objects are allowed to be for sale for L$0 to invoke buy UI behavior

+even though the user gets a free copy.

+-->

+    <spinner

+        follows="left|top"

+        decimal_digits="0"

+        increment="1"

+        top_pad="8"

+        left="118"

+        control_name="Edit Cost"

+        name="Edit Cost"

+        label="Price: L$"

+        label_width="65"

+        width="165"

+        min_val="0"

+        height="20"

+        max_val="999999999" />

+      <check_box

+	   height="15"

+	   width="110"

+	   top_pad="5"

+	   label="Show in search"

+       layout="topleft"

+	   left="100"

+       name="search_check"

+       tool_tip="Let people see this object in search results" />

+		<panel

+         border="false"

+         follows="left|top"

+         layout="topleft"

+         mouse_opaque="false"

+         background_visible="true"

+         bg_alpha_color="DkGray"

+         name="perms_build"

+         left="0"

+         top_pad="4"

+         height="105"

+         width="290">

+            <text

+             type="string"

+             length="1"

+             left="10"

+             top_pad="9"

+             text_color="EmphasisColor"

+             height="16"

+             follows="left|top|right"

+             layout="topleft"

+             name="perm_modify"

+             width="264">

+                You can modify this object

+            </text>

+            <text

+               type="string"

+               follows="left|top"

+               name="Anyone can:"

+               width="250"

+               left="10">

+                 Anyone:

+            </text>

+            <check_box

+             height="19"

+             label="Move"

+             layout="topleft"

+             name="checkbox allow everyone move"

+             left="10"

+             width="85" />

+            <check_box

+             height="19"

+             label="Copy"

+             layout="topleft"

+             left_pad="0"

+             name="checkbox allow everyone copy"

+             width="90" />

+            <text

+               type="string"

+               follows="left|top"

+               height="19"

+               name="Next owner can:"

+               width="250"

+               left="10">

+                  Next owner:

+            </text>

+            <check_box

+             follows="left|top|right"

+             label="Modify"

+             layout="topleft"

+             left="10"

+             name="checkbox next owner can modify"

+             width="85" />

+            <check_box

+             follows="left|top|right"

+             height="19"

+             label="Copy"

+             layout="topleft"

+             left_pad="0"

+             name="checkbox next owner can copy"

+             width="80" />

+            <check_box

+             follows="left|top|right"

+             height="19"

+             label="Transfer"

+             layout="topleft"

+             name="checkbox next owner can transfer"

+             left_pad="0"

+             top_delta="0"

+             tool_tip="Next owner can give away or resell this object"

+             width="100" />

+<!-- *NOTE: These "B/O/G/E/N/F fields may overlap "perm_modify" above, 

+     but that's OK, this is used only for debugging. -->

+            <text

+             type="string"

+             text_color="EmphasisColor"

+             length="1"

+             top="9"

+             follows="left|top"

+             layout="topleft"

+             left="230"

+             name="B:"

+             height="10"

+             width="80">

+                B:

+            </text>

+            <text

+             type="string"

+             text_color="White"

+             length="1"

+             follows="left|top"

+             layout="topleft"

+             left_delta="0"

+             top_pad="2"

+             name="O:"

+             height="10"

+             width="80">

+                O:

+            </text>

+            <text

+             type="string"

+             text_color="EmphasisColor"

+             length="1"

+             follows="left|top"

+             layout="topleft"

+             left_delta="0"

+             top_pad="2"

+             name="G:"

+             height="10"

+             width="80">

+                G:

+            </text>

+            <text

+             type="string"

+             text_color="White"

+             length="1"

+             follows="left|top"

+             left_delta="0"

+             top_pad="2"

+             layout="topleft"

+             name="E:"

+             height="10"

+             width="80">

+                E:

+            </text>

+            <text

+             type="string"

+             text_color="EmphasisColor"

+             length="1"

+             follows="left|top"

+             layout="topleft"

+             left_delta="0"

+             top_pad="2"

+             name="N:"

+             height="10"

+             width="80">

+                N:

+            </text>

+            <text

+             type="string"

+             text_color="White"

+             length="1"

+             follows="left|top"

+             layout="topleft"

+             left_delta="0"

+             top_pad="2"

+             name="F:"

+             height="10"

+             width="80">

+                F:

+            </text>

+        </panel>

+      </panel>

+      <!-- Object tab -->

+      <panel

+         border="false"

+         follows="all"

+         height="567"

+         label="Object"

+         layout="topleft"

+         left_delta="0"

+         mouse_opaque="false"

+         help_topic="toolbox_object_tab"

+         name="Object"

+         top="16"

+         width="295">

+            <check_box

+             height="19"

+             label="Locked"

+             layout="topleft"

+             name="checkbox locked"

+             tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."

+             top_pad="5"

+             left="10"

+             width="123" />

+            <check_box

+             height="19"

+             label="Physical"

+             layout="topleft"

+             name="Physical Checkbox Ctrl"

+             tool_tip="Allows object to be pushed and affected by gravity"

+             top_pad="0"

+             width="123" />

+            <check_box

+             height="19"

+             label="Temporary"

+             layout="topleft"

+             name="Temporary Checkbox Ctrl"

+             tool_tip="Causes object to be deleted 1 minute after creation"

+             top_pad="0"

+             width="123" />

+            <check_box

+             height="19"

+             label="Phantom"

+             layout="topleft"

+             name="Phantom Checkbox Ctrl"

+             tool_tip="Causes object to not collide with other objects or avatars"

+             top_pad="0"

+             width="123" />

+

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             name="label position"

+             top_pad="10"

+             width="121">

+                Position (meters)

+            </text>

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="X"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="512"

+             min_val="-256"

+             name="Pos X"

+             text_enabled_color="1 0 0.3 .7"

+             top_pad="5"

+             width="87" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Y"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="512"

+             min_val="-256"

+             name="Pos Y"

+             text_enabled_color="EmphasisColor"

+             top_pad="3"

+             width="87" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Z"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="4096"

+             name="Pos Z"

+             text_enabled_color="0 0.8 1 .65"

+             top_pad="3"

+             width="87" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="label size"

+             top_pad="6"

+             width="121">

+                Size (meters)

+            </text>

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="X"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="64"

+             min_val="0.01"

+             name="Scale X"

+             text_enabled_color="1 1 1 1"

+             top_pad="5"

+             width="87" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Y"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="64"

+             min_val="0.01"

+             name="Scale Y"

+             text_enabled_color="1 1 1 1"

+             top_pad="3"

+             width="87" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Z"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="64"

+             min_val="0.01"

+             name="Scale Z"

+             text_enabled_color="1 1 1 1"

+             top_pad="3"

+             width="87" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="label rotation"

+             top_pad="10"

+             width="121">

+                Rotation (degrees)

+            </text>

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="1"

+             initial_value="0"

+             label="X"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="9999"

+             min_val="-9999"

+             name="Rot X"

+             text_enabled_color="1 1 1 1"

+             top_pad="5"

+             width="87" />

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="1"

+             initial_value="0"

+             label="Y"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="9999"

+             min_val="-9999"

+             name="Rot Y"

+             text_enabled_color="1 1 1 1"

+             top_pad="3"

+             width="87" />

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="1"

+             initial_value="0"

+             label="Z"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="9999"

+             min_val="-9999"

+             name="Rot Z"

+             text_enabled_color="1 1 1 1"

+             top_pad="3"

+             width="87" />

+ <!--           <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="label basetype"

+             top="5"

+             width="150">

+                Prim Type

+            </text>-->

+            <combo_box

+             height="19"

+             layout="topleft"

+             name="comboBaseType"

+             top="6"

+             left="125"

+             width="150">

+                <combo_box.item

+                 label="Box"

+                 name="Box"

+                 value="Box" />

+                <combo_box.item

+                 label="Cylinder"

+                 name="Cylinder"

+                 value="Cylinder" />

+                <combo_box.item

+                 label="Prism"

+                 name="Prism"

+                 value="Prism" />

+                <combo_box.item

+                 label="Sphere"

+                 name="Sphere"

+                 value="Sphere" />

+                <combo_box.item

+                 label="Torus"

+                 name="Torus"

+                 value="Torus" />

+                <combo_box.item

+                 label="Tube"

+                 name="Tube"

+                 value="Tube" />

+                <combo_box.item

+                 label="Ring"

+                 name="Ring"

+                 value="Ring" />

+                <combo_box.item

+                 label="Sculpted"

+                 name="Sculpted"

+                 value="Sculpted" />

+            </combo_box>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="text cut"

+             top_pad="5"

+             width="150">

+                Path Cut (begin/end)

+            </text>

+            <spinner

+             follows="left|top"

+             height="16"

+             increment="0.025"

+             initial_value="0"

+             label="B"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="0.98"

+             name="cut begin"

+             top_pad="4"

+             width="68" />

+            <spinner

+             follows="left|top"

+             height="16"

+             increment="0.025"

+             initial_value="1"

+             label="E"

+             label_width="10"

+             layout="topleft"

+             left_pad="10"

+             min_val="0.02"

+             name="cut end"

+             top_delta="0"

+             width="68" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="text hollow"

+             top_pad="6"

+             width="68">

+                Hollow

+            </text>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_pad="10"

+             name="text skew"

+             width="63">

+                Skew

+            </text>

+            <spinner

+             decimal_digits="1"

+             follows="left|top"

+             height="19"

+             increment="5"

+             initial_value="0"

+             layout="topleft"

+             left="125"

+             max_val="95"

+             name="Scale 1"

+             top_pad="4"

+             width="68" />

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             layout="topleft"

+             left_pad="10"

+             max_val="0.95"

+             min_val="-0.95"

+             name="Skew"

+             top_delta="0"

+             width="68" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="15"

+             layout="topleft"

+             left="125"

+             name="Hollow Shape"

+             top_pad="4"

+             width="150">

+                Hollow Shape

+            </text>

+            <combo_box

+             height="23"

+             layout="topleft"

+             left_delta="0"

+             name="hole"

+             top_pad="-2"

+             width="150">

+                <combo_box.item

+                 label="Default"

+                 name="Default"

+                 value="Default" />

+                <combo_box.item

+                 label="Circle"

+                 name="Circle"

+                 value="Circle" />

+                <combo_box.item

+                 label="Square"

+                 name="Square"

+                 value="Square" />

+                <combo_box.item

+                 label="Triangle"

+                 name="Triangle"

+                 value="Triangle" />

+            </combo_box>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="text twist"

+             top_pad="5"

+             width="150">

+                Twist (begin/end)

+            </text>

+            <spinner

+             decimal_digits="0"

+             follows="left|top"

+             height="19"

+             increment="9"

+             initial_value="0"

+             label="B"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="180"

+             min_val="-180"

+             name="Twist Begin"

+             top_pad="4"

+             width="68" />

+            <spinner

+             decimal_digits="0"

+             follows="left|top"

+             height="19"

+             increment="9"

+             initial_value="0"

+             label="E"

+             label_width="10"

+             layout="topleft"

+             left_pad="10"

+             max_val="180"

+             min_val="-180"

+             name="Twist End"

+             top_delta="0"

+             width="68" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="scale_taper"

+             top_pad="3"

+             width="150">

+                Taper

+            </text>

+            <text

+			 visible="false"

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="scale_hole"

+             top_delta="0"

+             width="150">

+                Hole Size

+            </text>

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             label="X"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             min_val="-1"

+             name="Taper Scale X"

+             top_pad="4"

+             width="68" />

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             label="Y"

+             label_width="10"

+             layout="topleft"

+             left_pad="10"

+             min_val="-1"

+             name="Taper Scale Y"

+             top_delta="0"

+             width="68" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="text topshear"

+             top_pad="3"

+             width="141">

+                Top Shear

+            </text>

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             label="X"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="0.5"

+             min_val="-0.5"

+             name="Shear X"

+             top_pad="4"

+             width="68" />

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             label="Y"

+             label_width="10"

+             layout="topleft"

+             left_pad="10"

+             max_val="0.5"

+             min_val="-0.5"

+             name="Shear Y"

+             top_delta="0"

+             width="68" />

+            <text

+			 visible="false"

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="advanced_cut"

+             top_pad="3"

+             width="150">

+                Profile Cut (begin/end)

+            </text>

+            <text

+			 visible="false"

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="advanced_dimple"

+             top_delta="0"

+             width="150">

+                Dimple (begin/end)

+            </text>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="advanced_slice"

+             top_delta="0"

+             width="150">

+                Slice (begin/end)

+            </text>

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.02"

+             initial_value="0"

+             label="B"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="0.98"

+             name="Path Limit Begin"

+             top_pad="3"

+             width="68" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.02"

+             initial_value="1"

+             label="E"

+             label_width="10"

+             layout="topleft"

+             left_pad="10"

+             min_val="0.02"

+             name="Path Limit End"

+             top_delta="0"

+             width="68" />

+            <text

+			 visible="false"

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="text taper2"

+             top_pad="3"

+             width="150">

+                Taper

+            </text>

+            <spinner

+			 visible="false"

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             label="X"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             min_val="-1"

+             name="Taper X"

+             top_pad="3"

+             width="68" />

+            <spinner

+			 visible="false"

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             label="Y"

+             label_width="10"

+             layout="topleft"

+             left_pad="10"

+             min_val="-1"

+             name="Taper Y"

+             top_delta="0"

+             width="68" />

+            <text

+			 visible="false"

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="text radius delta"

+             top_pad="2"

+             width="78">

+                Radius

+            </text>

+            <text

+			 visible="false"

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="78"

+             name="text revolutions"

+             width="68">

+                Revolutions

+            </text>

+            <spinner

+			 visible="false"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             layout="topleft"

+             left="125"

+             min_val="-1"

+             name="Radius Offset"

+             top_pad="4"

+             width="68" />

+            <spinner

+			 visible="false"

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             initial_value="1"

+             layout="topleft"

+             left_pad="10"

+             max_val="4"

+             min_val="1"

+             name="Revolutions"

+             top_delta="0"

+             width="68" />

+            <texture_picker

+             can_apply_immediately="true"

+             default_image_name="Default"

+             follows="left|top"

+             height="141"

+             label="Sculpt Texture"

+             layout="topleft"

+             left="125"

+             name="sculpt texture control"

+             tool_tip="Click to choose a picture"

+             top="70"

+             visible="false"

+             width="145" />

+            <check_box

+             height="19"

+             label="Mirror"

+             layout="topleft"

+             left_delta="0"

+             name="sculpt mirror control"

+             tool_tip="Flips sculpted prim along the X axis"

+             top_pad="8"

+             visible="false"

+             width="130" />

+            <check_box

+             height="19"

+             label="Inside-out"

+             layout="topleft"

+             left_delta="0"

+             name="sculpt invert control"

+             tool_tip="Inverts the sculpted prims normals, making it appear inside-out"

+             top_pad="4"

+             visible="false"

+             width="121" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="label sculpt type"

+             top_pad="10"

+             visible="false"

+             width="130">

+                Stitching type

+            </text>

+            <combo_box

+             height="19"

+             layout="topleft"

+             left_delta="0"

+             name="sculpt type control"

+             top_pad="4"

+             visible="false"

+             width="150">

+                <combo_box.item

+                 label="(none)"

+                 name="None"

+                 value="None" />

+                <combo_box.item

+                 label="Sphere"

+                 name="Sphere"

+                 value="Sphere" />

+                <combo_box.item

+                 label="Torus"

+                 name="Torus"

+                 value="Torus" />

+                <combo_box.item

+                 label="Plane"

+                 name="Plane"

+                 value="Plane" />

+                <combo_box.item

+                 label="Cylinder"

+                 name="Cylinder"

+                 value="Cylinder" />

+              <combo_box.item

+                 label="Mesh"

+                 name="Mesh"

+                 value="Mesh" />

+            </combo_box>

+        </panel>

+        <panel

+         border="false"

+         follows="all"

+         height="367"

+         label="Features"

+         layout="topleft"

+         left_delta="0"

+         mouse_opaque="false"

+         help_topic="toolbox_features_tab"

+         name="Features"

+         top_delta="0"

+         width="295">

+	<panel.string name="None">None</panel.string>

+	<panel.string name="Prim">Prim</panel.string>

+	<panel.string name="Convex Hull">Convex Hull</panel.string>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="20"

+             layout="topleft"

+             left="10"

+             name="select_single"

+             top="5"

+             width="252"

+             word_wrap="true">

+                Select only one primitive to edit features.

+            </text>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="10"

+             name="edit_object"

+             top="5"

+             width="252">

+                Edit object features:

+            </text>

+            <check_box

+             height="19"

+             label="Flexible Path"

+             layout="topleft"

+             left="10"

+             name="Flexible1D Checkbox Ctrl"

+             tool_tip="Allows object to flex about the Z axis (Client-side only)"

+             top_pad="20"

+             width="121" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="1"

+             initial_value="2"

+             label="Softness"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="3"

+             name="FlexNumSections"

+             top_pad="10"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.5"

+             initial_value="0.3"

+             label="Gravity"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             min_val="-10"

+             name="FlexGravity"

+             top_pad="4"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.5"

+             initial_value="2"

+             label="Drag"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             name="FlexFriction"

+             top_pad="4"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.5"

+             initial_value="0"

+             label="Wind"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             name="FlexWind"

+             top_pad="4"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.5"

+             initial_value="1"

+             label="Tension"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             name="FlexTension"

+             top_pad="4"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Force X"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             min_val="-10"

+             name="FlexForceX"

+             top_pad="4"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Force Y"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             min_val="-10"

+             name="FlexForceY"

+             top_pad="4"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Force Z"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             min_val="-10"

+             name="FlexForceZ"

+             top_pad="4"

+             width="128" />

+

+            <check_box

+             height="16"

+             label="Light"

+             layout="topleft"

+             left="10"

+             name="Light Checkbox Ctrl"

+             tool_tip="Causes object to emit light"

+             top_pad="15"

+             width="60" />

+            <color_swatch

+             can_apply_immediately="true"

+             color="0.5 0.5 0.5 1"

+	     border.border_thickness="0"

+             follows="left|top"

+             height="50"

+             layout="topleft"

+             left_pad="10"

+             top_pad="-17"

+             name="colorswatch"

+             tool_tip="Click to open color picker"

+             width="40" />

+         <texture_picker

+            allow_no_texture="true"

+            top_delta="0"

+            can_apply_immediately="true"

+            default_image_name="Default"

+            follows="left|top"

+            height="48"

+            label=""

+            left_delta="57"

+            mouse_opaque="true"

+            name="light texture control"

+            tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)"

+            width="32" />

+          <spinner

+             follows="left|top"

+             height="19"

+             initial_value="0.5"

+             label="Intensity"

+             label_width="70"

+             layout="topleft"

+             left="10"

+             name="Light Intensity"

+             top_pad="3"

+             width="128" />

+          <spinner bottom_delta="0"

+                   decimal_digits="3"

+                   follows="left|top"

+                   height="16"

+                   increment="0.1"

+                   initial_value="0.5"

+                   label="FOV"

+                   label_width="55"

+                   left="144"

+                   max_val="3"

+                   min_val="0"

+                   mouse_opaque="true"

+                   name="Light FOV"

+                   width="120" />

+          <spinner follows="left|top"

+                   height="19"

+                   initial_value="5"

+                   label="Radius"

+                   label_width="70"

+                   layout="topleft"

+                   left="10"

+                   max_val="20"

+                   name="Light Radius"

+                   top_pad="3"

+                   width="128" />

+          <spinner bottom_delta="0"

+                   decimal_digits="3"

+                   follows="left|top"

+                   height="16"

+                   increment="0.5"

+                   initial_value="0.5"

+                   label="Focus"

+                   label_width="55"

+                   left="144"

+                   max_val="20"

+                   min_val="-20"

+                   mouse_opaque="true"

+                   name="Light Focus"

+                   width="120" />

+          <spinner follows="left|top"

+                   height="19"

+                   increment="0.25"

+                   initial_value="1"

+                   label="Falloff"

+                   label_width="70"

+                   layout="topleft"

+                   left="10"

+                   max_val="2"

+                   name="Light Falloff"

+                   top_pad="3"

+                   width="128" />

+          <spinner bottom_delta="0"

+                   decimal_digits="3"

+                   follows="left|top"

+                   height="16"

+                   increment="0.05"

+                   initial_value="1"

+                   label="Ambiance"

+                   label_width="55"

+                   left="144"

+                   max_val="1"

+                   min_val="0"

+                   mouse_opaque="true"

+                   name="Light Ambiance"

+                   width="120" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             name="label physicsshapetype"

+             top="38"

+             width="121">

+                Physics Shape Type:

+            </text>

+			<combo_box

+			   height="19"

+			   top_delta="15" 

+			   layout="topleft"

+			   follows="left|top"

+			   name="Physics Shape Type Combo Ctrl"

+			   tool_tip="Choose the physics shape type"

+			   width="108"/>

+            <combo_box

+             height="19"

+             layout="topleft"

+             name="material"

+             top_pad="5"

+             width="150">

+                <combo_box.item

+                 label="Stone"

+                 name="Stone"

+                 value="Stone" />

+                <combo_box.item

+                 label="Metal"

+                 name="Metal"

+                 value="Metal" />

+                <combo_box.item

+                 label="Glass"

+                 name="Glass"

+                 value="Glass" />

+                <combo_box.item

+                 label="Wood"

+                 name="Wood"

+                 value="Wood" />

+                <combo_box.item

+                 label="Flesh"

+                 name="Flesh"

+                 value="Flesh" />

+                <combo_box.item

+                 label="Plastic"

+                 name="Plastic"

+                 value="Plastic" />

+                <combo_box.item

+                 label="Rubber"

+                 name="Rubber"

+                 value="Rubber" />

+            </combo_box>

+

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="1"

+             initial_value="1"

+             label="Gravity"

+             label_width="70"

+             layout="topleft"

+             min_val="-1"

+             max_val="28"

+             name="Physics Gravity"

+             top_pad="10"

+             width="132" />

+

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.1"

+             initial_value="0"

+             label="Friction"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="255"

+             min_val="0"

+             name="Physics Friction"

+             top_pad="4"

+             width="132" />

+

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.1"

+             initial_value="0"

+             label="Density"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="22587"

+             min_val="1"

+             name="Physics Density"

+             top_pad="4"

+             width="132" />

+

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Restitution"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="1"

+             min_val="0"

+             name="Physics Restitution"

+             top_pad="4"

+             width="132" />

+        </panel>

+         <panel

+         border="false"

+         follows="all"

+         height="367"

+         label="Texture"

+         layout="topleft"

+         left_delta="0"

+         mouse_opaque="false"

+         help_topic="toolbox_texture_tab"

+         name="Texture"

+         top_delta="0"

+         width="295">

+            <panel.string

+             name="string repeats per meter">

+                Repeats Per Meter

+            </panel.string>

+            <panel.string

+             name="string repeats per face">

+                Repeats Per Face

+            </panel.string>

+            <texture_picker

+             can_apply_immediately="true"

+             default_image_name="Default"

+             fallback_image="locked_image.j2c"

+             follows="left|top"

+             height="80"

+             label="Texture"

+             layout="topleft"

+             left="10"

+             name="texture control"

+             tool_tip="Click to choose a picture"

+             top="8"

+             width="64" />

+            <color_swatch

+             can_apply_immediately="true"

+             follows="left|top"

+             height="80"

+             label="Color"

+             layout="topleft"

+             left_pad="15"

+             name="colorswatch"

+             tool_tip="Click to open color picker"

+             top_delta="0"

+             width="64" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_pad="15"

+             name="color trans"

+             text_readonly_color="LabelDisabledColor"

+             top="6"

+             width="110">

+                Transparency %

+            </text>

+            <spinner

+             decimal_digits="0"

+             follows="left|top"

+             height="19"

+             increment="2"

+             initial_value="0"

+             layout="topleft"

+             left_delta="0"

+             max_val="100"

+             name="ColorTrans"

+             top_pad="4"

+             width="80" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="glow label"

+             text_readonly_color="LabelDisabledColor"

+             top_pad="8"

+             width="80">

+                Glow

+            </text>

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             initial_value="0"

+             layout="topleft"

+             left_delta="0"

+             name="glow"

+             top_pad="4"

+             width="80" />

+            <check_box

+             height="19"

+             label="Full Bright"

+             layout="topleft"

+             left_delta="-5"

+             name="checkbox fullbright"

+             top_pad="4"

+             width="81" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="10"

+             name="tex gen"

+             text_readonly_color="LabelDisabledColor"

+             top_pad="5"

+             width="90">

+                Mapping

+            </text>

+            <combo_box

+             height="23"

+             layout="topleft"

+             left_delta="0"

+             name="combobox texgen"

+             top_pad="4"

+             width="90">

+                <combo_box.item

+                 label="Default"

+                 name="Default"

+                 value="Default" />

+                <combo_box.item

+                 label="Planar"

+                 name="Planar"

+                 value="Planar" />

+            </combo_box>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             name="label shininess"

+             left_pad="4"

+             text_readonly_color="LabelDisabledColor"

+             top_pad="-37"

+             width="90">

+                Shininess

+            </text>

+            <combo_box

+             height="23"

+             layout="topleft"

+             left_delta="0"

+             name="combobox shininess"

+             top_pad="4"

+             width="90">

+                <combo_box.item

+                 label="None"

+                 name="None"

+                 value="None" />

+                <combo_box.item

+                 label="Low"

+                 name="Low"

+                 value="Low" />

+                <combo_box.item

+                 label="Medium"

+                 name="Medium"

+                 value="Medium" />

+                <combo_box.item

+                 label="High"

+                 name="High"

+                 value="High" />

+            </combo_box>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_pad="4"

+             name="label bumpiness"

+             text_readonly_color="LabelDisabledColor"

+             top_pad="-37"

+             width="90">

+                Bumpiness

+            </text>

+            <combo_box

+             height="23"

+             layout="topleft"

+             left_delta="0"

+             name="combobox bumpiness"

+             top_pad="4"

+             width="90">

+                <combo_box.item

+                 label="None"

+                 name="None"

+                 value="None" />

+                <combo_box.item

+                 label="Brightness"

+                 name="Brightness"

+                 value="Brightness" />

+                <combo_box.item

+                 label="Darkness"

+                 name="Darkness"

+                 value="Darkness" />

+                <combo_box.item

+                 label="woodgrain"

+                 name="woodgrain"

+                 value="woodgrain" />

+                <combo_box.item

+                 label="bark"

+                 name="bark"

+                 value="bark" />

+                <combo_box.item

+                 label="bricks"

+                 name="bricks"

+                 value="bricks" />

+                <combo_box.item

+                 label="checker"

+                 name="checker"

+                 value="checker" />

+                <combo_box.item

+                 label="concrete"

+                 name="concrete"

+                 value="concrete" />

+                <combo_box.item

+                 label="crustytile"

+                 name="crustytile"

+                 value="crustytile" />

+                <combo_box.item

+                 label="cutstone"

+                 name="cutstone"

+                 value="cutstone" />

+                <combo_box.item

+                 label="discs"

+                 name="discs"

+                 value="discs" />

+                <combo_box.item

+                 label="gravel"

+                 name="gravel"

+                 value="gravel" />

+                <combo_box.item

+                 label="petridish"

+                 name="petridish"

+                 value="petridish" />

+                <combo_box.item

+                 label="siding"

+                 name="siding"

+                 value="siding" />

+                <combo_box.item

+                 label="stonetile"

+                 name="stonetile"

+                 value="stonetile" />

+                <combo_box.item

+                 label="stucco"

+                 name="stucco"

+                 value="stucco" />

+                <combo_box.item

+                 label="suction"

+                 name="suction"

+                 value="suction" />

+                <combo_box.item

+                 label="weave"

+                 name="weave"

+                 value="weave" />

+            </combo_box>

+          <!--

+            <line_editor

+             bevel_style="in"

+             border_style="line"

+             border_thickness="1"

+             follows="left|top"

+             height="16"

+             layout="topleft"

+             left="10"

+             max_length_bytes="63"

+             name="Home Url"

+             select_on_focus="true"

+             top="134"

+             width="250" />

+            <check_box

+             height="16"

+             label="Media Face"

+             layout="topleft"

+             left_delta="0"

+             name="has media"

+             top_pad="6"

+             width="70" />

+            <button

+             follows="left|top"

+             font="SansSerifSmall"

+             height="20"

+             label="Set Media Info"

+             label_selected="Set Media Info"

+             layout="topleft"

+             left_pad="60"

+             name="media info set"

+             top_delta="-4"

+             width="120" />

+-->

+            <check_box

+             follows="top|left"

+             height="16"

+             initial_value="false"

+             label="Align planar faces"

+             layout="topleft"

+             left="17"

+             name="checkbox planar align"

+             tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."

+             top_delta="26"

+             width="140" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="10"

+             name="rpt"

+             text_readonly_color="LabelDisabledColor"

+             top_pad="2"

+             width="140">

+                Repeats / Face

+            </text>

+            <spinner

+             follows="left|top"

+             height="19"

+             initial_value="0"

+             label="Horizontal (U)"

+             label_width="125"

+             layout="topleft"

+             left="20"

+             max_val="100"

+             name="TexScaleU"

+             top_pad="5"

+             width="185" />

+            <check_box

+             height="19"

+             label="Flip"

+             layout="topleft"

+             left_pad="5"

+             name="checkbox flip s"

+             top_delta="0"

+             width="70" />

+            <spinner

+             follows="left|top"

+             height="19"

+             initial_value="0"

+             label="Vertical (V)"

+             label_width="125"

+             layout="topleft"

+             left="20"

+             max_val="100"

+             name="TexScaleV"

+             width="185" />

+            <check_box

+             height="19"

+             label="Flip"

+             layout="topleft"

+             left_pad="5"

+             name="checkbox flip t"

+             top_delta="0"

+             width="70" />

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="1"

+             initial_value="0"

+			 label="Rotation˚"

+             layout="topleft"

+			 label_width="135"

+             left="10"

+             max_val="9999"

+             min_val="-9999"

+             name="TexRot"

+             width="195" />

+

+            <spinner

+             decimal_digits="1"

+             follows="left|top"

+             height="23"

+             initial_value="1"

+			 label="Repeats / Meter"

+             layout="topleft"

+			 label_width="135"

+             left="10"

+             max_val="10"

+             min_val="0.1"

+             name="rptctrl"

+             width="195" />

+            <button

+             follows="left|top"

+             height="23"

+             label="Apply"

+             label_selected="Apply"

+             layout="topleft"

+             left_pad="5"

+             name="button apply"

+             width="75" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="10"

+             name="tex offset"

+             text_readonly_color="LabelDisabledColor"

+             width="200">

+                Texture Offset

+            </text>

+            <spinner

+             follows="left|top"

+             height="19"

+             initial_value="0"

+             label="Horizontal (U)"

+             label_width="125"

+             layout="topleft"

+             left="20"

+             min_val="-1"

+             name="TexOffsetU"

+             width="185" />

+            <spinner

+             follows="left|top"

+             height="19"

+             initial_value="0"

+             label="Vertical (V)"

+             label_width="125"

+             layout="topleft"

+             left_delta="0"

+             min_val="-1"

+             name="TexOffsetV"

+             top_pad="1"

+             width="185" />

+        <panel

+         border="false"

+         follows="left|top"

+         layout="topleft"

+         mouse_opaque="false"

+         background_visible="true"

+         bg_alpha_color="DkGray"

+         name="Add_Media"

+         left="0"

+         height="47"

+         width="290">

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="18"

+             layout="topleft"

+             left="10"

+             top_pad="3"

+             name="media_tex"

+             width="190">

+              Media

+			</text>

+			<button

+			 follows="top|left"

+			 height="18"

+			 image_selected="AddItem_Press"

+			 image_unselected="AddItem_Off"

+			 image_disabled="AddItem_Disabled"

+			 layout="topleft"

+			 left_pad="0"

+			 name="add_media"

+			 tab_stop="false"

+			 top_delta="0"

+			 tool_tip="Add Media"

+			 width="18">

+				<button.commit_callback

+				function="BuildTool.AddMedia"/>

+			</button>

+			<button

+			 follows="top|left"

+			 height="18"

+			 image_selected="TrashItem_Press"

+			 image_unselected="TrashItem_Off"

+			 layout="topleft"

+			 left_pad="5"

+			 name="delete_media"

+			 tool_tip="Delete this media texture"

+			 top_delta="0"

+			 width="18">

+				<button.commit_callback

+				function="BuildTool.DeleteMedia"/>

+			</button>

+			<button

+			 follows="top|left"

+			 tool_tip="Edit this Media"

+			 height="12"

+             image_disabled="Icon_Gear_Background"

+             image_selected="Icon_Gear_Press"

+             image_unselected="Icon_Gear_Foreground"

+			 layout="topleft"

+			 left_pad="10"

+			 name="edit_media"

+			 top_delta="3"

+			 width="12">

+				<button.commit_callback

+				function="BuildTool.EditMedia"/>

+			</button>

+      <text

+			 follows="left|top|right"

+			 height="9"

+			 layout="topleft"

+			 left="10"

+                         use_ellipses="true"

+			 read_only="true"

+			 name="media_info"

+			 width="280" />

+      <web_browser

+        visible="false"

+        enabled="false"

+        border_visible="true"

+        bottom_delta="0"

+        follows="top|left"

+        left="0"

+        name="title_media"

+        width="4"

+        height="4"

+        start_url="about:blank"

+        decouple_texture_size="true" />

+     <button

+			 follows="right|top"

+			 height="22"

+			 label="Align"

+			 label_selected="Align Media"

+			 layout="topleft"

+			 right="-16"

+			 name="button align"

+			 top_delta="-4"

+			 tool_tip="Align media texture (must load first)"

+			 width="80" />

+		</panel>

+	   </panel>

+       <panel

+         border="false"

+         follows="all"

+         label="Content"

+         layout="topleft"

+         left_delta="0"

+         mouse_opaque="false"

+         help_topic="toolbox_contents_tab"

+         name="Contents"

+         top_delta="0"

+         width="295">

+            <button

+             follows="left|top"

+             height="23"

+             label="New Script"

+             label_selected="New Script"

+             layout="topleft"

+             left="10"

+             name="button new script"

+             top="10"

+             width="134" />

+            <button

+             follows="left|top"

+             height="23"

+             label="Permissions"

+             layout="topleft"

+             left_pad="8"

+             name="button permissions"

+             width="134" />

+            <panel_inventory_object

+             border="true"

+             border_visible="true"

+             bevel_style="in"

+             follows="left|top|right"

+             height="325"

+             layout="topleft"

+             left="10"

+             name="contents_inventory"

+             top="50"

+             width="275" />

+		</panel>

+        </tab_container>

+	<panel

+	 follows="left|top"

+     height="384"

+     layout="topleft"

+     left_delta="0"

+     name="land info panel"

+     top_delta="0"

+     width="295">

+    <text

+         type="string"

+         length="1"

+         font="SansSerifBig"

+         follows="left|top"

+         height="19"

+         layout="topleft"

+         left="20"

+         name="label_parcel_info"

+         top="24"

+         width="240">

+            Parcel Information

+        </text>

+        <text

+         type="string"

+         length="1"

+         follows="left|top"

+         height="19"

+         layout="topleft"

+         left="30"

+         name="label_area_price"

+         top="48"

+         width="150">

+            Price: L$[PRICE] for [AREA] m²

+        </text>

+        <text

+         type="string"

+         length="1"

+         follows="left|top"

+         height="19"

+         layout="topleft"

+         left_delta="0"

+         name="label_area"

+         top_delta="0"

+         width="150">

+            Area: [AREA] m²

+        </text>

+        <button

+         follows="left|top"

+         height="23"

+         label="About Land"

+         label_selected="About Land"

+         layout="topleft"

+         left_delta="0"

+         name="button about land"

+         top_pad="4"

+         width="125" />

+        <check_box

+         control_name="ShowParcelOwners"

+         height="19"

+         label="Show owners"

+         layout="topleft"

+         left_delta="0"

+         name="checkbox show owners"

+         tool_tip="Colorize the parcels according to the type of owner: &#10;&#10;Green = Your land &#10;Aqua = Your group&apos;s land &#10;Red = Owned by others &#10;Yellow = For sale &#10;Purple = For auction &#10;Grey = Public"

+         top_pad="8"

+         width="205" />

+        <text

+         type="string"

+         length="1"

+         font="SansSerifBig"

+         follows="left|top"

+         height="19"

+         layout="topleft"

+         left="20"

+         name="label_parcel_modify"

+         top="152"

+         width="240">

+            Modify Parcel

+        </text>

+        <button

+         follows="left|top"

+         height="23"

+         label="Subdivide"

+         label_selected="Subdivide"

+         layout="topleft"

+         left="30"

+         name="button subdivide land"

+         top="172"

+         width="125" />

+        <button

+         follows="left|top"

+         height="23"

+         label="Join"

+         label_selected="Join"

+         layout="topleft"

+         left_delta="0"

+         name="button join land"

+         top_pad="4"

+         width="125" />

+        <text

+         type="string"

+         length="1"

+         font="SansSerifBig"

+         follows="left|top"

+         height="19"

+         layout="topleft"

+         left="20"

+         name="label_parcel_trans"

+         top="256"

+         width="240">

+            Land Transactions

+        </text>

+        <button

+         follows="left|top"

+         height="23"

+         label="Buy Land"

+         label_selected="Buy Land"

+         layout="topleft"

+         left="30"

+         name="button buy land"

+         top="276"

+         width="125" />

+        <button

+         follows="left|top"

+         height="23"

+         label="Abandon Land"

+         label_selected="Abandon Land"

+         layout="topleft"

+         left_delta="0"

+         name="button abandon land"

+         top_pad="4"

+         width="125" />

+ </panel>

+<!-- end of tabs -->

+</floater>

diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
index b06c6dc215..4dfdcd15c7 100644
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -105,7 +105,7 @@
      left_delta="0"
      name="id_text"
      top_pad="10"
-     width="100">
+     width="107">
         Object ID:
     </text>
     <line_editor
@@ -116,7 +116,7 @@
      left_pad="3"
      name="id_editor"
      top_delta="-3"
-     width="575" />
+     width="568" />
     <button
      follows="bottom|right"
      height="23"
@@ -138,7 +138,7 @@
      left="10"
      top_pad="5"
      name="obj_name_text"
-     width="100">
+     width="107">
         Object name:
     </text>
     <line_editor
@@ -148,7 +148,7 @@
      left_pad="3"
      name="object_name_editor"
      top_delta="-3"
-     width="575" />
+     width="568" />
     <button
      follows="bottom|right"
      height="23"
@@ -170,7 +170,7 @@
      left="10"
      top_pad="5"
      name="owner_name_text"
-     width="100">
+     width="107">
         Owner:
     </text>
     <line_editor
@@ -180,7 +180,7 @@
      left_pad="3"
      name="owner_name_editor"
      top_delta="-3"
-     width="575" />
+     width="568" />
     <button
      follows="bottom|right"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 30eff8e6a7..f38ea04858 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -43,6 +43,30 @@
                      function="File.EnableUpload" />
                 </menu_item_call>
                 <menu_item_call
+                 label="Model..."
+                 layout="topleft"
+                 name="Upload Model">
+                <menu_item_call.on_click
+                 function="File.UploadModel"
+                 parameter="" />
+                <menu_item_call.on_enable
+                 function="File.EnableUploadModel" />
+                <menu_item_call.on_visible
+                function="File.VisibleUploadModel"/>
+                </menu_item_call>
+              <menu_item_call
+                label="Model Wizard..."
+                layout="topleft"
+                name="Upload Model Wizard">
+                <menu_item_call.on_click
+                 function="Floater.Show"
+                 parameter="upload_model_wizard" />
+                <menu_item_call.on_enable
+                 function="File.EnableUploadModel" />
+                <menu_item_call.on_visible
+                function="File.VisibleUploadModel"/>
+	      </menu_item_call>
+                <menu_item_call
                  label="Bulk (L$[COST] per file)..."
                  layout="topleft"
                  name="Bulk Upload">
@@ -67,7 +91,7 @@
                  function="Inventory.DoCreate"
                  parameter="category" />
             </menu_item_call>
-    <menu_item_call
+            <menu_item_call
                     label="Inbox"
                    layout="topleft"
                     name="Inbox">
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 32c1d7083a..4c4ff3e5c4 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -187,7 +187,7 @@
        name="Web Content Floater Debug Test">
         <menu_item_call.on_click
          function="Advanced.WebContentTest"
-         parameter="http://callum-linden.s3.amazonaws.com/browsertest.html"/>
+         parameter="http://google.com"/>
       </menu_item_call>
       <menu_item_check
         label="Show Grid Picker"
diff --git a/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml
new file mode 100644
index 0000000000..2650903f88
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="model_menu_gear_default"
+ visible="false">
+  <menu_item_check
+   label="Show edges"
+   layout="topleft"
+   name="show_edges">
+    <on_click
+       function="ModelImport.ViewOption.Action"
+       parameter="show_edges" />
+    <on_check
+       function="ModelImport.ViewOption.Check"
+       parameter="show_edges" />
+    <on_enable
+			 function="ModelImport.ViewOption.Enabled"
+			 parameter="show_edges" />
+  </menu_item_check>
+  <menu_item_check
+   label="Show physics"
+   layout="topleft"
+   name="show_physics">
+    <on_click
+       function="ModelImport.ViewOption.Action"
+       parameter="show_physics" />
+    <on_check
+       function="ModelImport.ViewOption.Check"
+       parameter="show_physics" />
+    <on_enable
+			 function="ModelImport.ViewOption.Enabled"
+			 parameter="show_physics" />
+  </menu_item_check>
+  <menu_item_check
+  label="Show textures"
+  layout="topleft"
+  name="show_textures">
+    <on_click
+       function="ModelImport.ViewOption.Action"
+       parameter="show_textures" />
+    <on_check
+       function="ModelImport.ViewOption.Check"
+       parameter="show_textures" />
+    <on_enable
+			 function="ModelImport.ViewOption.Enabled"
+			 parameter="show_textures" />
+  </menu_item_check>
+  <menu_item_check
+  label="Show skin weight"
+  layout="topleft"
+  name="show_skin_weight">
+    <on_click
+       function="ModelImport.ViewOption.Action"
+       parameter="show_skin_weight" />
+    <on_check
+       function="ModelImport.ViewOption.Check"
+       parameter="show_skin_weight" />
+    <on_enable
+			 function="ModelImport.ViewOption.Enabled"
+			 parameter="show_skin_weight" />
+  </menu_item_check>
+  <menu_item_check
+  label="Show joint positions"
+  layout="topleft"
+  name="show_joint_positions">
+    <on_click
+       function="ModelImport.ViewOption.Action"
+       parameter="show_joint_positions" />
+    <on_check
+       function="ModelImport.ViewOption.Check"
+       parameter="show_joint_positions" />
+    <on_enable
+			 function="ModelImport.ViewOption.Enabled"
+			 parameter="show_joint_positions" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8a85a331e5..81046e99a0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -89,7 +89,7 @@
          visibility_control="VoiceMorphingEnabled">
             <menu_item_check.on_check
              function="Floater.Visible"
-             parameter="voice_effect" />
+             Parameter="voice_effect" />
             <menu_item_check.on_click
              function="Floater.Toggle"
              parameter="voice_effect" />
@@ -972,6 +972,30 @@
                  parameter="Upload Animation" />
             </menu_item_call>
             <menu_item_call
+           label="Model..."
+           layout="topleft"
+           name="Upload Model">
+            <menu_item_call.on_click
+             function="File.UploadModel"
+             parameter="" />
+            <menu_item_call.on_enable
+             function="File.EnableUploadModel" />
+            <menu_item_call.on_visible
+            function="File.VisibleUploadModel"/>
+            </menu_item_call>
+			<menu_item_call
+           label="Model Wizard..."
+           layout="topleft"
+           name="Upload Model Wizard">
+				<menu_item_call.on_click
+				 function="Floater.Show"
+				 parameter="upload_model_wizard" />
+				<menu_item_call.on_enable
+				 function="File.EnableUploadModel" />
+				<menu_item_call.on_visible
+				function="File.VisibleUploadModel"/>
+			</menu_item_call>
+            <menu_item_call
              label="Bulk (L$[COST] per file)..."
              layout="topleft"
              name="Bulk Upload">
@@ -1342,15 +1366,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"
@@ -1877,6 +1901,16 @@
                  function="Advanced.ToggleConsole"
                  parameter="memory view" />
             </menu_item_check>
+            <menu_item_check
+               label="Scene Statistics"
+               name="Scene Statistics">
+              <menu_item_check.on_check
+               function="Advanced.CheckConsole"
+               parameter="scene view" />
+              <menu_item_check.on_click
+               function="Advanced.ToggleConsole"
+               parameter="scene view" />
+            </menu_item_check>
 
             <menu_item_separator/>
 
@@ -1961,6 +1995,17 @@
                  function="ToggleControl"
                  parameter="DebugShowTime" />
             </menu_item_check>
+          <menu_item_check
+             label="Show Upload Cost"
+             layout="topleft"
+             name="Show Upload Cost">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="DebugShowUploadCost" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="DebugShowUploadCost" />
+          </menu_item_check>
             <menu_item_check
              label="Show Render Info"
              name="Show Render Info">
@@ -2144,6 +2189,16 @@
          parameter="bboxes" />
         </menu_item_check>
         <menu_item_check
+         label="Normals"
+         name="Normals">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="normals" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="normals" />
+        </menu_item_check>
+        <menu_item_check
          label="Octree"
          name="Octree">
           <menu_item_check.on_check
@@ -2164,6 +2219,16 @@
            parameter="shadow frusta" />
         </menu_item_check>
         <menu_item_check
+         label="Physics Shapes"
+         name="Physics Shapes">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="physics shapes" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="physics shapes" />
+        </menu_item_check>
+        <menu_item_check
          label="Occlusion"
          name="Occlusion">
           <menu_item_check.on_check
@@ -2234,6 +2299,26 @@
            parameter="face area" />
         </menu_item_check>
         <menu_item_check
+         label="LOD Info"
+         name="LOD Info">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="lod info" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="lod info" />
+        </menu_item_check>
+        <menu_item_check
+         label="Build Queue"
+         name="Build Queue">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="build queue" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="build queue" />
+        </menu_item_check>
+        <menu_item_check
          label="Lights"
          name="Lights">
           <menu_item_check.on_check
@@ -2263,6 +2348,16 @@
            function="Advanced.ToggleInfoDisplay"
            parameter="raycast" />
         </menu_item_check>
+		<menu_item_check
+         label="Sculpt"
+         name="Sculpt">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="sculpt" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="sculpt" />
+		</menu_item_check>
       </menu>
         <menu
          create_jump_keys="true"
@@ -2319,19 +2414,6 @@
                 <menu_item_check.on_enable
                  function="Advanced.EnableObjectObjectOcclusion" />
             </menu_item_check>
-          <menu_item_check
-             label="Framebuffer Objects"
-             name="Framebuffer Objects">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="RenderUseFBO" />
-            <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="RenderUseFBO" />
-            <menu_item_check.on_enable
-                 function="Advanced.EnableRenderFBO" />
-           </menu_item_check>
-
           <menu_item_separator />
 
           <menu_item_check
@@ -2758,7 +2840,6 @@
                  function="Floater.Toggle"
                  parameter="region_debug_console" />
             </menu_item_check>
-
             <menu_item_separator />
 
             <menu_item_check
@@ -3166,7 +3247,7 @@
             <menu_item_call.on_click
              function="Advanced.LeaveAdminStatus" />
         </menu_item_call>
-        <menu_item_check
+		<menu_item_check
          label="Show Admin Menu"
          name="View Admin Options">
             <menu_item_check.on_enable
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d0dd639249..5e7bd605d2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5227,6 +5227,20 @@ Insufficient permissions to rez object.
 
   <notification
    icon="notifytip.tga"
+   name="IMAcrossParentEstates"
+   type="notifytip">
+Unable to send IM across parent estates.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="TransferInventoryAcrossParentEstates"
+   type="notifytip">
+Unable to transfer inventory across parent estates.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
    name="UnableToLoadNotecard"
    type="notifytip">
 Unable to load notecard.
@@ -6721,7 +6735,7 @@ Unable to find the help topic for this element.
   <tag>fail</tag>
   </notification>
 
-    <notification
+     <notification
  icon="alertmodal.tga"
  name="ObjectMediaFailure"
  type="alertmodal">
@@ -6753,6 +6767,17 @@ Your voice has been muted by moderator.
          name="okbutton"
          yestext="OK"/>
     </notification>
+  
+   <notification
+    icon="alertmodal.tga"
+    name="UploadCostConfirmation"
+    type="alertmodal">
+This upload will cost L$[PRICE], do you wish to continue with the upload?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Upload"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
@@ -6781,6 +6806,14 @@ The button will be shown when there is enough space for it.
    type="notifytip">
 Select residents to share with.
   </notification>
+
+  <notification
+    name="MeshUploadError"
+    icon="alert.tga"
+    type="alert">
+    [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+  </notification>
+   
   <notification
    icon="notifytip.tga"
    name="ShareItemsConfirmation"
@@ -6995,7 +7028,6 @@ Mute everyone?
      notext="Cancel"
      unique="true"/>
   </notification>
-
   <notification
   name="HintChat"
   label="Chat"
@@ -7299,10 +7331,6 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
    notext="Don't Quit"/>
   </notification>
 
-  <global name="UnsupportedCPU">
-- Your CPU speed does not meet the minimum requirements.
-  </global>
-
   <global name="UnsupportedGLRequirements">
 You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
 
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 600b0e3b71..607e1bb213 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -84,7 +84,7 @@ Maximum 200 per group daily
        name="create_new_notice"
        tool_tip="Create a new notice"
        top_delta="0"
-       width="93" />
+       width="127" />
      <button
      follows="top|left"
      height="23"
@@ -128,7 +128,7 @@ Maximum 200 per group daily
          layout="topleft"
          name="lbl3"
          top_pad="10"
-         width="60">
+         width="62">
             Subject:
         </text>
         <line_editor
@@ -141,7 +141,7 @@ Maximum 200 per group daily
          max_length_bytes="63"
          name="create_subject"
          prevalidate_callback="ascii"
-         width="220" />
+         width="218" />
         <text
          follows="left|top"
          type="string"
@@ -151,7 +151,7 @@ Maximum 200 per group daily
          left="10"
          name="lbl4"
          top_pad="5"
-         width="60">
+         width="62">
             Message:
         </text>
         <text_editor
@@ -162,7 +162,7 @@ Maximum 200 per group daily
          max_length="511"
          name="create_message"
          top_delta="0"
-         width="220"
+         width="218"
          word_wrap="true" />
         <text
          follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index 38e8b9844f..cdf14572fe 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -196,7 +196,7 @@
    initial_val="256" 
    label="" 
    label_width="0"
-   left_delta="40" 
+   left_delta="68" 
    max_val="2048" 
    min_val="0" 
    mouse_opaque="true"
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"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index cdc462109c..ea09286592 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -180,14 +180,14 @@
      increment="1"
      initial_value="23"
      label="Nearby chat toasts life time:"
-     label_width="190"
+     label_width="285"
      layout="topleft"
      left="45"
      max_val="60"
      min_val="1"
      name="nearby_toasts_lifetime"
      top_pad="10"
-     width="230" />
+     width="325" />
     <spinner
      control_name="NearbyToastFadingTime"
      decimal_digits="0"
@@ -196,14 +196,14 @@
      increment="1"
      initial_value="3"
      label="Nearby chat toasts fading time:"
-     label_width="190"
+     label_width="285"
      layout="topleft"
      left_delta="0"
      max_val="60"
      min_val="0"
      name="nearby_toasts_fadingtime"
      top_pad="3"
-     width="230" />
+     width="325" />
     
     <check_box
      control_name="TranslateChat"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 8a37822413..2b22f0d6e3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -47,7 +47,7 @@
    height="12"
    name="font_colors"
    top_pad="20"
-   width="120"
+   width="170"
    >
     Chat font colors:
   </text>
@@ -208,6 +208,37 @@
   </text>
   <color_swatch
    can_apply_immediately="true"
+   color="LtOrange"
+   follows="left|top"
+   height="24"
+   label_height="0"
+   layout="topleft"
+   left="360"
+   name="direct"
+   top_pad="-15"
+   width="44" >
+    <color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="DirectChatColor" />
+    <color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="DirectChatColor" />
+  </color_swatch>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="10"
+   layout="topleft"
+   left_pad="5"
+   mouse_opaque="false"
+   name="text_box10"
+   top_delta="5"
+   width="95">
+    Direct
+  </text>
+  <color_swatch
+   can_apply_immediately="true"
    color="LtYellow"
    follows="left|top"
    height="24"
@@ -275,7 +306,7 @@
    height="12"
    name="bubble_chat"
    top_pad="20"
-   width="450"
+   width="495"
    >
     Name tag background color (also affects Bubble Chat):
   </text>
@@ -320,7 +351,7 @@
    height="12"
    name="floater_opacity"
    top_pad="15"
-   width="120"
+   width="200"
    >
     Floater Opacity:
   </text>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index d74197d965..f7666bdc4c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -193,8 +193,18 @@
 		 left_delta="0"
 		 name="BumpShiny"
 		 top_pad="1"
+		width="256" />
+    <check_box
+		control_name="RenderLocalLights"
+		height="16"
+		initial_value="true"
+		label="Local Lights"
+		layout="topleft"
+		left_delta="0"
+		name="LocalLights"
+		 top_pad="1"
 		 width="256" />
-		<check_box
+		  <check_box
 		 control_name="VertexShaderEnable"
 		 height="16"
 		 initial_value="true"
@@ -221,7 +231,6 @@
 			<check_box.commit_callback
 			 function="Pref.VertexShaderEnable" />
 		</check_box>
-<!-- DISABLED UNTIL WE REALLY WANT TO SUPPORT THIS
     	<check_box
 		 control_name="RenderDeferred"
 		 height="16"
@@ -248,6 +257,19 @@
          	<check_box.commit_callback
 			 function="Pref.VertexShaderEnable" />
     	</check_box>
+      <check_box
+		 control_name="RenderDepthOfField"
+		 height="16"
+		 initial_value="true"
+		 label="Depth of Field"
+		 layout="topleft"
+		 left_delta="0"
+		 name="UseDoF"
+		 top_pad="1"
+		 width="256">
+        <check_box.commit_callback
+     function="Pref.VertexShaderEnable" />
+      </check_box>
 
         <text
          type="string"
@@ -283,7 +305,7 @@
             name="2"
             value="2"/>
         </combo_box>
--->
+
         <text
          type="string"
          length="1"
@@ -701,7 +723,7 @@
        follows="left|top"
        height="12"
        layout="topleft"
-       left="358"
+       left="407"
        left_pad="-30"
        name="TerrainDetailText"
         top="250"
@@ -713,7 +735,7 @@
        draw_border="false"
        height="38"
        layout="topleft"
-       left_delta="0"
+       left_delta="5"
        name="TerrainDetailRadio"
        top_pad="5"
        width="70">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 04412bdb9c..1a8aae7f91 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -195,7 +195,7 @@
      left="0"
      name="radio_teleport"
      top_delta="20"
-     width="100" />
+     width="110" />
     <radio_item
      height="16"
      label="Auto-pilot"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index e374c89f21..91fe6f544c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -341,7 +341,7 @@
      layout="topleft"
      left="25"
      name="voice_chat_settings"
-     width="180"
+     width="200"
      top_pad="7">
 	  Voice Chat Settings
     </text>
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 2868d91cc7..4535c56339 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -132,4 +132,12 @@
      name="cancel_btn"
      top="700"
      width="90" />
+  <web_browser
+   follows="all"
+   layout="topleft"
+   left="0"
+   name="login_media_panel"
+   width="1024"
+   height="768"
+   top="0"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index ca9579284b..3f9195d092 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -114,7 +114,7 @@
      layout="topleft"
      left="10"
      name="allow_land_resell_check"
-     top="160"
+     top="150"
      width="80" />
     <check_box
      height="20"
@@ -122,7 +122,7 @@
      layout="topleft"
      left="10"
      name="allow_parcel_changes_check"
-     top="180"
+     top="170"
      width="80" />
     <check_box
      height="20"
@@ -131,7 +131,17 @@
      left="10"
      name="block_parcel_search_check"
      tool_tip="Let people see this region and its parcels in search results"
-     top="200"
+     top="190"
+     width="80" />
+	<check_box
+     visible="FALSE"
+     height="20"
+     label="Allow Mesh Objects"
+     layout="topleft"
+     left="10"
+     name="mesh_rez_enabled_check"
+     tool_tip="Let people rez mesh objects on this region"
+     top="210"
      width="80" />
     <spinner
      decimal_digits="0"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b0ede60fa0..339f14eacb 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -58,6 +58,83 @@
 	<string name="Quit">Quit</string>
 	<string name="create_account_url">http://join.secondlife.com/</string>
 
+	<string name="LoginFailedViewerNotPermitted">
+The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer:
+http://secondlife.com/download
+
+For more information, see our FAQ below:
+http://secondlife.com/viewer-access-faq</string>
+	<string name="LoginIntermediateOptionalUpdateAvailable">Optional viewer update available: [VERSION]</string>
+	<string name="LoginFailedRequiredUpdate">Required viewer update: [VERSION]</string>
+	<string name="LoginFailedAlreadyLoggedIn">This agent is already logged in.
+</string>
+	<string name="LoginFailedAuthenticationFailed">Sorry! We couldn't log you in.
+Please check to make sure you entered the right
+    * Username (like bobsmith12 or steller.sunshine)
+    * Password
+Also, please make sure your Caps Lock key is off.</string>
+	<string name="LoginFailedPasswordChanged">As a security precaution your password has been changed.
+Please go to your account page at http://secondlife.com/password
+and answer the security question to reset your password.
+We are very sorry for the inconvenience.</string>
+	<string name="LoginFailedPasswordReset">We made some changes to our system and you will need to reset your password.
+Please go to your account page at http://secondlife.com/password
+and answer the security question to reset your password.
+We are very sorry for the inconvenience.</string>
+	<string name="LoginFailedEmployeesOnly">Second Life is temporarily closed for maintenance.
+Logins are currently restricted to employees only.
+Check www.secondlife.com/status for updates.</string>
+	<string name="LoginFailedPremiumOnly">Second Life logins are temporarily restricted in order to make sure that those in-world have the best possible experience.
+	 	
+People with free accounts will not be able to access Second Life during this time, to make room for those who have paid for Second Life.</string>
+	<string name="LoginFailedComputerProhibited">Second Life cannot be accessed from this computer.
+If you feel this is an error, please contact
+support@secondlife.com.</string>
+	<string name="LoginFailedAcountSuspended">Your account is not accessible until
+[TIME] Pacific Time.</string>
+	<string name="LoginFailedAccountDisabled">We are unable to complete your request at this time.
+Please contact Second Life support for assistance at http://secondlife.com/support.
+If you are unable to change your password, please call (866) 476-9763.</string>
+	<string name="LoginFailedTransformError">Data inconsistency found during login.
+Please contact support@secondlife.com.</string>
+	<string name="LoginFailedAccountMaintenance">Your account is undergoing minor maintenance.
+Your account is not accessible until
+[TIME] Pacific Time.
+If you feel this is an error, please contact support@secondlife.com.</string>
+	<string name="LoginFailedPendingLogoutFault">Request for logout responded with a fault from simulator.</string>
+	<string name="LoginFailedPendingLogout">The system is logging you out right now.
+Your Account will not be available until
+[TIME] Pacific Time.</string>
+	<string name="LoginFailedUnableToCreateSession">Unable to create valid session.</string>
+	<string name="LoginFailedUnableToConnectToSimulator">Unable to connect to a simulator.</string>
+	<string name="LoginFailedRestrictedHours">Your account can only access Second Life
+between [START] and [END] Pacific Time.
+Please come back during those hours.
+If you feel this is an error, please contact support@secondlife.com.</string>
+	<string name="LoginFailedIncorrectParameters">Incorrect parameters.
+If you feel this is an error, please contact support@secondlife.com.</string>
+	<string name="LoginFailedFirstNameNotAlphanumeric">First name parameter must be alphanumeric.
+If you feel this is an error, please contact support@secondlife.com.</string>
+	<string name="LoginFailedLastNameNotAlphanumeric">Last name parameter must be alphanumeric.
+If you feel this is an error, please contact support@secondlife.com.</string>
+	<string name="LogoutFailedRegionGoingOffline">Region is going offline.
+Please try logging in again in a minute.</string>
+	<string name="LogoutFailedAgentNotInRegion">Agent not in region.
+Please try logging in again in a minute.</string>
+	<string name="LogoutFailedPendingLogin">The region was logging in another session.
+Please try logging in again in a minute.</string>
+	<string name="LogoutFailedLoggingOut">The region was logging out the previous session.
+Please try logging in again in a minute.</string>
+	<string name="LogoutFailedStillLoggingOut">The region is still logging out the previous session.
+Please try logging in again in a minute.</string>
+	<string name="LogoutSucceeded">Region has logged out last session.
+Please try logging in again in a minute.</string>
+	<string name="LogoutFailedLogoutBegun">Region has begun the logout process.
+Please try logging in again in a minute.</string>
+	<string name="LoginFailedLoggingOutSession">The system has begun logging out your last session.
+Please try logging in again in a minute.</string>
+
+
 	<!-- Disconnection -->
 	<string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>
 	<string name="SavingSettings">Saving your settings...</string>
@@ -198,6 +275,7 @@
 	<string name="favorite">favorite</string>
 	<string name="symbolic link">link</string>
 	<string name="symbolic folder link">folder link</string>
+  <string name="mesh">mesh</string>
 
 	<!-- llvoavatar. Displayed in the avatar chat bubble -->
 	<string name="AvatarEditingAppearance">(Editing Appearance)</string>
@@ -1830,6 +1908,15 @@ Requests single-word username of an avatar.  When data is available the dataserv
 key llRequestDisplayName(key id)
 Requests name of an avatar.  When data is available the dataserver event will be raised.
 </string>
+<string name="LSLTipText_llRegionSayTo" translate="false">
+llRegionSayTo(key target, integer channel, string msg)
+Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
+</string>
+<string name="LSLTipText_llGetEnv" translate="false">
+llGetEnv(string name)
+Returns a string with the requested data about the region
+</string>
+
 
   <!-- Avatar busy/away mode -->
 	<string name="AvatarSetNotAway">Not Away</string>
@@ -2008,6 +2095,7 @@ Requests name of an avatar.  When data is available the dataserver event will be
 	<string name="InvFolder Initial Outfits">Initial Outfits</string>
 	<string name="InvFolder My Outfits">My Outfits</string>
 	<string name="InvFolder Accessories">Accessories</string>
+	<string name="InvFolder Meshes">Meshes</string>
 
   <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
 	<string name="InvFolder Friends">Friends</string>