From 29dc641fbe7ab77f77fe19e2e7976980f0649b5b Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Tue, 22 Mar 2011 20:39:31 -0400
Subject: initial effort to enable a debug display to show render complexity.
 Using for internal demo, will get it code reviewed if it merges in.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 +++++++
 .../skins/default/xui/en/panel_region_terrain.xml  | 34 ++++++++++++++++++++++
 2 files changed, 44 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ea40a08c95..7a227fb5f9 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2338,6 +2338,16 @@
            function="Advanced.ToggleInfoDisplay"
            parameter="raycast" />
         </menu_item_check>
+        <menu_item_check
+         label="Render Complexity"
+         name="rendercomplexity">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="rendercomplexity" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="rendercomplexity" />
+        </menu_item_check>
       </menu>
         <menu
          create_jump_keys="true"
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index 5093c52129..d7a629e543 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -115,6 +115,40 @@
      name="apply_btn"
      top="135"
      width="90" />
+    <combo_box
+     height="23"
+     layout="topleft"
+     left="50"
+     name="SkyPresetsCombo"
+     top="165"
+     width="150" />
+    <combo_box
+     height="23"
+     layout="topleft"
+     left="200"
+     name="WaterPresetsCombo"
+     top="165"
+     width="150" />
+    <button
+     enabled="false"
+     follows="left|top"
+     height="20"
+     label="Apply"
+     layout="topleft"
+     left="370"
+     name="wes_apply_btn"
+     top="165"
+     width="90" />
+    <button
+     enabled="false"
+     follows="left|top"
+     height="20"
+     label="Edit Environment"
+     layout="topleft"
+     left="370"
+     name="env_editor_btn"
+     top="195"
+     width="120" />
     <view_border
      bevel_style="none"
      follows="top|left"
-- 
cgit v1.2.3


From c57c8c21881f0ee543f63f45b524f442a59fa7d2 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Tue, 17 May 2011 18:33:59 -0400
Subject: SH-1246 WIP fix render cost in the viewer

Modified avatar display to compute values correctly.
Also changed build tools XML temporarily so build tool
costs can be seen.
---
 .../newview/skins/default/xui/en/floater_tools.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 05d47506db..b99a8b6228 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -788,35 +788,35 @@
      name="linked_set_count"
      top="144"
      width="80">
-        Linked Sets: [COUNT]
+        L: [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]" 
+     right="-100"
+     name="object_count"
      width="80">
-        Cost: [COST] / [PHYSICS]
+        O: [COUNT]
     </text>
     <text
     text_color="LtGray_50"
      type="string"
      length="1"
+     height="10"
      follows="left|top"
      halign="right"
      layout="topleft"
-     top_pad="5"
-     right="-120"
-     name="object_count"
+     top_delta="0"
+     right="-8"
+     name="linked_set_cost"
+     tool_tip="Cost of currently selected linked sets as [prims],[physics complexity]" 
      width="80">
-        Objects: [COUNT]
+        Cost: [COST] / [PHYSICS]
     </text>
     <text
     text_color="LtGray_50"
@@ -825,7 +825,7 @@
      follows="left|top"
      halign="right"
      layout="topleft"
-	 top_delta="0"
+	 top_pad="5"
      right="-8"
      name="object_cost"
      tool_tip="Cost of currently selected objects as [prims] / [physics complexity]"
-- 
cgit v1.2.3


From 6a521b0578d430246c5ae5492a6dc9bc9060c2ff Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Mon, 23 May 2011 11:55:43 -0400
Subject: Changing labeling of avatar render cost to clarify that its a new
 algorithm.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3d23cee742..3b268a1937 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1199,7 +1199,7 @@
                  parameter="stats" />
             </menu_item_check>
       <menu_item_check
-        label="Show Avatar Rendering Cost"
+        label="Show Draw Weight for Avatars"
         name="Avatar Rendering Cost">
            <menu_item_check.on_check
             function="Advanced.CheckInfoDisplay"
-- 
cgit v1.2.3


From e0782e32e5c4471fe11395f176d7c496125e3334 Mon Sep 17 00:00:00 2001
From: seth_productengine <none@none>
Date: Wed, 20 Jul 2011 23:36:39 +0300
Subject: =?UTF-8?q?SH-2059=20FIXED=20Mesh=20uploader=20UI=20clean=20up.=20?=
 =?UTF-8?q?-=20When=20the=20=E2=80=9CLoad=20from=20file=E2=80=9D=20radio?=
 =?UTF-8?q?=20is=20selected,=20the=20labels=20uner=20it=20are=20disabled.?=
 =?UTF-8?q?=20-=20Added=20horizontal=20lines=20to=20LoD=20tab=20like=20in?=
 =?UTF-8?q?=20the=20physics=20tab.=20-=20Physics=20tab:=20LoD=20dropdown?=
 =?UTF-8?q?=20moved=20to=20the=20left,=20against=20the=20=E2=80=9CUse=20Le?=
 =?UTF-8?q?vel=20of=20Detail=E2=80=9D=20label.=20-=20Modifiers=20tab:=20fi?=
 =?UTF-8?q?xed=20dimensions=20to=20show=20a=20z=20value.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skins/default/xui/en/floater_model_preview.xml | 61 ++++++++++++++++++----
 1 file changed, 50 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 1d4a1d4827..0b7b4c684c 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -173,6 +173,18 @@ L$ [MODEL]
       name="lod_panel"
       help_topic="upload_model_lod">
 
+      <!-- LOD TABLE-->
+      <panel
+        follows="top|left"
+        name="lod table"
+        left="0"
+        top="0"
+        width="300"
+        height="163"
+        visible="true"
+        border="true"
+        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
+
       <text left="10" width="240" bottom="20" height="15" follows="left|top" name="lod_table_header">
         Select Level of Detail:
       </text>
@@ -210,9 +222,22 @@ L$ [MODEL]
       </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 left_pad="5" width="230" height="28" follows="left|top" top_pad="-15" wrap="true" name="lod_status_message_text"/>
+      </panel>
 
-      <text top_pad="-3" left="10" height="15" follows="left|top">
+      <!-- LOD MESH-->
+      <panel
+        follows="top|left"
+        name="mesh"
+        left="0"
+        top_pad="0"
+        width="300"
+        height="237"
+        visible="true"
+        border="true"
+        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
+
+      <text top_pad="5" left="10" height="15" follows="left|top">
         Mesh
       </text>
 
@@ -236,10 +261,10 @@ L$ [MODEL]
       <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">
+      <text follows="top|left" name="build_operator_text" left="45" top_pad="10" width="100" height="15" text_readonly_color="LabelDisabledColor">
         Build Operator:  
       </text>
-      <text follows="top|left" name="queue_mode_text" left_pad="5" width="100" height="15">
+      <text follows="top|left" name="queue_mode_text" left_pad="5" width="100" height="15" text_readonly_color="LabelDisabledColor">
         Queue Mode:
       </text>
       <combo_box follows="top|left" name="build_operator" top_pad="5" left="45" width="100" height="20">
@@ -263,11 +288,11 @@ L$ [MODEL]
         </combo_item>
       </combo_box>
 
-      <text top_pad="10" name="border_mode_text" left="45" follows="left|top" width="100" height="15">
+      <text top_pad="10" name="border_mode_text" left="45" follows="left|top" width="100" height="15" text_readonly_color="LabelDisabledColor">
         Border Mode:
       </text>
 
-      <text left_pad="5" name="share_tolderance_text"  follows="left|top" width="100" height="15">
+      <text left_pad="5" name="share_tolderance_text"  follows="left|top" width="100" height="15" text_readonly_color="LabelDisabledColor">
         Share Tolerance:
       </text>
 
@@ -280,14 +305,28 @@ L$ [MODEL]
         </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">
+      </panel>
+
+      <!-- LOD GENERATE NORMALS-->
+      <panel
+        follows="top|left"
+        name="generate normals"
+        left="0"
+        top_pad="0"
+        width="300"
+        height="46"
+        visible="true"
+        border="true"
+        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
+
+      <text left="10" top_pad="5" 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 -->
@@ -314,8 +353,8 @@ L$ [MODEL]
           <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_box left="150" top="10" follows="left|top" height="18"
+	        name="physics_lod_combo" width="130" tool_tip="LOD to use for physics shape">
           <combo_item name="physics_lowest">
             Lowest
           </combo_item>
@@ -448,7 +487,7 @@ L$ [MODEL]
 
       <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">
+      <text left_pad="20" height="15" width="140" name="import_dimensions" follows="top|left">
         [X] x [Y] x [Z] m
       </text>
 
-- 
cgit v1.2.3


From aa40614cd4cf05d3d8e78be2e05a0f5cdcfde5cc Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 21 Jul 2011 20:31:00 +0300
Subject: SH-2101 FIXED Remove checkbox for per-region mesh disablement

- Remove checkbox for per-region mesh disablement and corresponding code
---
 indra/newview/skins/default/xui/en/panel_region_general.xml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'indra/newview/skins')

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 3f9195d092..44c84e69a1 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -133,17 +133,7 @@
      tool_tip="Let people see this region and its parcels in search results"
      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
+	<spinner
      decimal_digits="0"
      follows="left|top"
      height="20"
-- 
cgit v1.2.3


From 50b9c63382121df879680cf43f5be6fc09686607 Mon Sep 17 00:00:00 2001
From: seth_productengine <none@none>
Date: Fri, 22 Jul 2011 22:40:18 +0300
Subject: SH-1868 WIP Added user-supplied metric data for uploading a model.

The mesh category string selected by user within the model data and sent to the server during calculating the upload fee and upload requests.

The accounting info and the upload permissions warning in the bottom left corner of the floater are temporarily made mutually exclusive.
---
 .../skins/default/xui/en/floater_model_preview.xml     | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 0b7b4c684c..bfa245cbc1 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -32,6 +32,22 @@
   </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="model_category_label" text_color="White">
+    What does this model represent?
+  </text>
+  <combo_box top_pad="1" follows="left|top" height="23"
+	     name="model_category_combo"  width="200">
+    <combo_box.drop_down_button
+      label_color="White"/>
+    <combo_item name="Avatar shape" label="Avatar shape" value="MUT_AvatarShape"/>
+    <combo_item name="Avatar attachment" label="Avatar attachment" value="MUT_AvatarAttachment"/>
+    <combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/>
+    <combo_item name="Moving object (vehicle, animal)" label="Moving object (vehicle, animal)" value="MUT_MovingObject"/>
+    <combo_item name="Large, non moving etc" label="Large, non moving etc" value="MUT_LargeStationary"/>
+    <combo_item name="Smaller, non-moving etc" label="Smaller, non-moving etc" value="MUT_SmallStationary"/>
+    <combo_item name="Not really any of these" label="Not really any of these" value="MUT_Other"/>
+  </combo_box>
   
   <text bottom_delta="20" left="15" follows="left|top" height="15" name="lod_label">
     Preview:
@@ -96,7 +112,7 @@
 
   <text
 	height="65"
-	top_delta="45"
+	top_delta="0"
 	left_delta="0"
 	name="weights_text"
 	width="80"
-- 
cgit v1.2.3


From ea3d58b3141a7277870b66262ee0afb9c23c3423 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Wed, 27 Jul 2011 21:20:04 +0300
Subject: SH-1868 FIXED Rearranged the accounting info to leave enough room for
 the upload permissions warning. Removed hiding the accounting info when
 warning is displayed.

---
 .../skins/default/xui/en/floater_model_preview.xml | 37 +++++++++++++++-------
 1 file changed, 26 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index bfa245cbc1..c52f48cfaf 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -111,32 +111,47 @@
      You will not be able to complete the final upload of this model to the Second Life servers. [[VURL] Find out how] to get enabled for mesh model uploads.</text>
 
   <text
-	height="65"
-	top_delta="0"
+	height="26"
+	top_pad="5"
 	left_delta="0"
-	name="weights_text"
+	name="weights_text_left"
 	width="80"
 	word_wrap="true" 
 	>
 Download:
 Physics:
-Server:
-
-Prim equivs:
   </text>
-
   <text
-	height="65"
+	height="26"
 	top_delta="0"
-	left_delta="80"
-	name="weights"
+	left_pad="0"
+	name="weights_left"
 	width="70"
 	word_wrap="true" 
 	>
 [ST]
 [PH]
+  </text>
+  <text
+	height="26"
+	top_delta="0"
+	left_pad="0"
+	name="weights_text_right"
+	width="80"
+	word_wrap="true" 
+	>
+Server:
+Prim equivs:
+  </text>
+  <text
+	height="26"
+	top_delta="0"
+	left_pad="0"
+	name="weights_right"
+	width="70"
+	word_wrap="true" 
+	>
 [SIM]
-
 [EQ]
   </text>
 
-- 
cgit v1.2.3


From 6c7653c65bd3f9907bcd4a8a54e4e5c1d172d15e Mon Sep 17 00:00:00 2001
From: seth_productengine <none@none>
Date: Thu, 28 Jul 2011 18:41:43 +0300
Subject: SH-2169 FIXED New object weights floater added.

---
 .../default/xui/en/floater_object_weights.xml      | 310 +++++++++++++++++++++
 .../newview/skins/default/xui/en/floater_tools.xml |   2 +-
 2 files changed, 311 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_object_weights.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_object_weights.xml b/indra/newview/skins/default/xui/en/floater_object_weights.xml
new file mode 100644
index 0000000000..f377386679
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_object_weights.xml
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="true"
+ can_tear_off="false"
+ height="315"
+ help_topic="objects_weight_floater"
+ layout="topleft"
+ name="object_weights"
+ save_rect="true"
+ single_instance="true"
+ title="ADVANCED"
+ width="200">
+    <floater.string
+     name="nothing_selected"
+     value="--"/>
+
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="selected_text"
+     text_color="EmphasisColor"
+     top="10"
+     value="SELECTED"
+     width="180" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="objects"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="objects_label"
+     top_delta="0"
+     value="Objects"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="prims"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="prims_label"
+     top_delta="0"
+     value="Prims"
+     width="130" />
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="0"
+     layout="topleft"
+     left="10"
+     name="selected_text_border"
+     top_pad="5"
+     width="180"/>
+
+
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="weights_of_selected_text"
+     text_color="EmphasisColor"
+     top_pad="10"
+     value="WEIGHTS OF SELECTED"
+     width="180" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="download"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="download_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="download_label"
+     top_delta="0"
+     value="Download"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="physics"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="physics_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="physics_label"
+     top_delta="0"
+     value="Physics"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="server"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="server_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="server_label"
+     top_delta="0"
+     value="Server"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="display"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="display_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="display_label"
+     top_delta="0"
+     value="Display"
+     width="130" />
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="0"
+     layout="topleft"
+     left="10"
+     name="weights_text_border"
+     top_pad="5"
+     width="180"/>
+
+
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="land_impacts_text"
+     text_color="EmphasisColor"
+     top_pad="10"
+     value="LAND IMPACTS"
+     width="180" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="selected"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="selected_label"
+     top_delta="0"
+     value="Selected"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="rezzed_on_land"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="rezzed_on_land_label"
+     top_delta="0"
+     value="Rezzed on land"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="remaining_capacity"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="remaining_capacity"
+     top_delta="0"
+     value="Remaining capacity"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="total_capacity"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="total_capacity"
+     top_delta="0"
+     value="Total capacity"
+     width="130" />
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="0"
+     layout="topleft"
+     left="10"
+     name="land_impacts_text_border"
+     top_pad="5"
+     width="180"/>
+
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="total_capacity"
+     top_pad="10"
+     value="[secondlife:///www.secondlife.com What is all this?...]"
+     width="180" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 8901583799..e794a7067d 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -742,7 +742,7 @@
 	  top_pad="0"
 	  visible="false"
 	  width="280">
-	  Physics weight [PHYS_WEIGHT], Render Cost [DISP_WEIGHT].
+	  Physics weight [PHYS_WEIGHT], Render Cost [DISP_WEIGHT]. [secondlife:///app/openfloater/object_weights More info]
 	</text>
     <!-- <text -->
     <!-- text_color="LtGray_50" -->
-- 
cgit v1.2.3


From 1b7b319ae22ac7598b7b3d75ccbec75263450e07 Mon Sep 17 00:00:00 2001
From: seth_productengine <none@none>
Date: Tue, 2 Aug 2011 00:16:13 +0300
Subject: SH-2170 WIP Object and land data added to new weights floater.

The data is updated upon object selection change. The land data is displayed for the land containing the primary selected object.
Loading indicators added for land impacts.
---
 .../default/xui/en/floater_object_weights.xml      | 38 ++++++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_object_weights.xml b/indra/newview/skins/default/xui/en/floater_object_weights.xml
index f377386679..a73db3af32 100644
--- a/indra/newview/skins/default/xui/en/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/en/floater_object_weights.xml
@@ -222,6 +222,14 @@
      top_pad="3"
      value="--"
      width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="selected_loading_indicator"
+     top_delta="0"
+     width="16" />
     <text
      follows="left|top"
      height="16"
@@ -241,6 +249,14 @@
      top_pad="3"
      value="--"
      width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="rezzed_on_land_loading_indicator"
+     top_delta="0"
+     width="16" />
     <text
      follows="left|top"
      height="16"
@@ -260,12 +276,20 @@
      top_pad="3"
      value="--"
      width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="remaining_capacity_loading_indicator"
+     top_delta="0"
+     width="16" />
     <text
      follows="left|top"
      height="16"
      layout="topleft"
      left_pad="10"
-     name="remaining_capacity"
+     name="remaining_capacity_label"
      top_delta="0"
      value="Remaining capacity"
      width="130" />
@@ -279,12 +303,20 @@
      top_pad="3"
      value="--"
      width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="total_capacity_loading_indicator"
+     top_delta="0"
+     width="16" />
     <text
      follows="left|top"
      height="16"
      layout="topleft"
      left_pad="10"
-     name="total_capacity"
+     name="total_capacity_label"
      top_delta="0"
      value="Total capacity"
      width="130" />
@@ -303,7 +335,7 @@
      height="16"
      layout="topleft"
      left="10"
-     name="total_capacity"
+     name="help_SLURL"
      top_pad="10"
      value="[secondlife:///www.secondlife.com What is all this?...]"
      width="180" />
-- 
cgit v1.2.3


From c70a357a274d5acd7921c3185dc34b89069d4e61 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Wed, 10 Aug 2011 18:59:10 +0300
Subject: SH-2076 FIXED Removed the sculpt type 'None' from edit dialog. If a
 prim's sculpt type was set to 'None' it is displayed as 'Plane' in the combo
 box.

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index e794a7067d..03d6c84266 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1999,26 +1999,22 @@ even though the user gets a free copy.
              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" />
+                 value="1" />
                 <combo_box.item
                  label="Torus"
                  name="Torus"
-                 value="Torus" />
+                 value="2" />
                 <combo_box.item
                  label="Plane"
                  name="Plane"
-                 value="Plane" />
+                 value="3" />
                 <combo_box.item
                  label="Cylinder"
                  name="Cylinder"
-                 value="Cylinder" />
+                 value="4" />
               </combo_box>
         </panel>
         <panel
-- 
cgit v1.2.3


From 1d4ccaeb74641ebf199072c8568e26f8fe002d32 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Wed, 17 Aug 2011 16:29:20 +0300
Subject: SH-2285 FIXED Add localization capability to mesh uploader strings

- Added the convex decomposition strings to the strings.xml

- Added names to hardcoded strings.
---
 .../skins/default/xui/en/floater_model_preview.xml | 28 +++++++++++-----------
 indra/newview/skins/default/xui/en/strings.xml     |  8 +++++++
 2 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index c52f48cfaf..ec18f1948b 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -220,9 +220,9 @@ L$ [MODEL]
         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" bottom_delta="16" left="75" name="triangles" width="65" height="18" follows="left|top" value="Triangles"/>
+      <text valign="center" halign="center" bg_visible="true" left_pad="0" width="65" name="vertices" height="18" follows="left|top" value="Vertices"/>
+      <text valign="center" halign="center" left_pad="0" name="status" 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"/>
@@ -268,7 +268,7 @@ L$ [MODEL]
         border="true"
         bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
 
-      <text top_pad="5" left="10" height="15" follows="left|top">
+      <text top_pad="5" left="10" name="mesh_label" height="15" follows="left|top">
         Mesh
       </text>
 
@@ -350,7 +350,7 @@ L$ [MODEL]
         border="true"
         bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
 
-      <text left="10" top_pad="5" follows="top|left" width="240" height="15">
+      <text left="10" name="gen_normals_label" top_pad="5" 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">
@@ -422,15 +422,15 @@ L$ [MODEL]
        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">
+        <text follows="left|top" bottom="40" height="30" left="10" name="method_label" font="SansSerifBig">
           Step 1: Analysis
         </text>
         
-        <text top_pad="5" width="50" follows="top|left" height="15">
+        <text name="analysis_method_label" 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">
+        <text left="160" name="quality_label" 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"/>
@@ -456,11 +456,11 @@ L$ [MODEL]
        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">
+        <text follows="left|top" bottom="40" height="30" left="10" name="second_step_label" font="SansSerifBig">
           Step 2: Simplification
         </text>
 
-        <text left="10" top_pad="5" height="15" width="140" follows="top|left">
+        <text left="10" name="simp_method_header" top_pad="5" height="15" width="140" follows="top|left">
           Method:
         </text>
         
@@ -509,10 +509,10 @@ L$ [MODEL]
       name="modifiers_panel"
       help_topic="upload_model_modifiers">
 
-      <text left="10" width="90" bottom="30" follows="top|left" height="15">
+      <text left="10" name="scale_label" width="90" bottom="30" follows="top|left" height="15">
         Scale:
       </text>
-      <text left_pad="5" width="140" follows="top|left" height="15">
+      <text left_pad="5" name="dimensions_label" width="140" follows="top|left" height="15">
         Dimensions:
       </text>
 
@@ -522,7 +522,7 @@ L$ [MODEL]
         [X] x [Y] x [Z] m
       </text>
 
-      <text left="10" top_pad="20" follows="top|left" height="15">
+      <text left="10" name="include_label" top_pad="20" follows="top|left" height="15">
         Include:
       </text>
 
@@ -530,7 +530,7 @@ L$ [MODEL]
       <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">
+      <text left="10" name="pelvis_offset_label" top_pad="4" width="90" bottom="30" follows="top|left" height="15">
         Pelvis Z Offset:
       </text>
 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f049f857f0..72b412efe2 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3625,5 +3625,13 @@ Try enclosing path to the editor with double quotes.
   <string name="BeaconSound">Viewing sound beacons (yellow)</string>
   <string name="BeaconMedia">Viewing media beacons (white)</string>
   <string name="ParticleHiding">Hiding Particles</string>
+  
+  <!-- Mesh UI terms -->
+  <string name="Retain%">Retain%</string>
+  <string name="Detail">Detail</string>
+  <string name="Better Detail">Better Detail</string>
+  <string name="Surface">Surface</string>
+  <string name="Solid">Solid</string>
+  <string name="Wrap">Wrap</string>
 
   </strings>
-- 
cgit v1.2.3


From 0540b3b07667698fd50f693b56001fa3f3f00689 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Wed, 17 Aug 2011 17:59:11 +0300
Subject: SH-1868 FIXED Support initial user-supplied metric data for upload

- Added initial value to the combobox
---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index ec18f1948b..7c6896becf 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -40,6 +40,7 @@
 	     name="model_category_combo"  width="200">
     <combo_box.drop_down_button
       label_color="White"/>
+    <combo_item name="Choose one" label="Choose One..." value="MUT_Unspecified"/>
     <combo_item name="Avatar shape" label="Avatar shape" value="MUT_AvatarShape"/>
     <combo_item name="Avatar attachment" label="Avatar attachment" value="MUT_AvatarAttachment"/>
     <combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/>
-- 
cgit v1.2.3


From ba79c8a3caaac0b37fc2eb9c54849e1ca2a121c2 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 19 Aug 2011 18:49:17 +0300
Subject: SH-2285 FIXED Add localization capability to mesh uploader strings

- Added ability to translate "Preview" and "Normal" strings.
---
 indra/newview/skins/default/xui/en/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 72b412efe2..23e0da7f7e 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3633,5 +3633,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Surface">Surface</string>
   <string name="Solid">Solid</string>
   <string name="Wrap">Wrap</string>
+  <string name="Preview">Preview</string>
+  <string name="Normal">Normal</string>
 
   </strings>
-- 
cgit v1.2.3


From a36e8dae40c53e5631cac8efc206d2355a3ff705 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 19 Aug 2011 19:33:22 +0300
Subject: SH-2309 WIP Priority modifications to mesh uploader UI

- Swapped left and right sides of the floater
---
 .../skins/default/xui/en/floater_model_preview.xml | 312 ++++++++++++---------
 1 file changed, 174 insertions(+), 138 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 7c6896becf..8f6058a824 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -27,135 +27,6 @@
   <string name="tbd">TBD</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="model_category_label" text_color="White">
-    What does this model represent?
-  </text>
-  <combo_box top_pad="1" follows="left|top" height="23"
-	     name="model_category_combo"  width="200">
-    <combo_box.drop_down_button
-      label_color="White"/>
-    <combo_item name="Choose one" label="Choose One..." value="MUT_Unspecified"/>
-    <combo_item name="Avatar shape" label="Avatar shape" value="MUT_AvatarShape"/>
-    <combo_item name="Avatar attachment" label="Avatar attachment" value="MUT_AvatarAttachment"/>
-    <combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/>
-    <combo_item name="Moving object (vehicle, animal)" label="Moving object (vehicle, animal)" value="MUT_MovingObject"/>
-    <combo_item name="Large, non moving etc" label="Large, non moving etc" value="MUT_LargeStationary"/>
-    <combo_item name="Smaller, non-moving etc" label="Smaller, non-moving etc" value="MUT_SmallStationary"/>
-    <combo_item name="Not really any of these" label="Not really any of these" value="MUT_Other"/>
-  </combo_box>
-  
-  <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
-     font="SansSerif"
-	 bottom_delta="15"
-     left_delta="0"
-     name="warning_title"
-     text_color="Yellow"
-     visible="false">
-     WARNING:
-    </text>
-    <text
-     text_color="White"
-     height="40"
-	 width="290"
-	 top_delta="15"
-     left_delta="0"
-     name="warning_message"
-     parse_urls="true"
-     wrap="true"
-     visible="false">
-     You will not be able to complete the final upload of this model to the Second Life servers. [[VURL] Find out how] to get enabled for mesh model uploads.</text>
-
-  <text
-	height="26"
-	top_pad="5"
-	left_delta="0"
-	name="weights_text_left"
-	width="80"
-	word_wrap="true" 
-	>
-Download:
-Physics:
-  </text>
-  <text
-	height="26"
-	top_delta="0"
-	left_pad="0"
-	name="weights_left"
-	width="70"
-	word_wrap="true" 
-	>
-[ST]
-[PH]
-  </text>
-  <text
-	height="26"
-	top_delta="0"
-	left_pad="0"
-	name="weights_text_right"
-	width="80"
-	word_wrap="true" 
-	>
-Server:
-Prim equivs:
-  </text>
-  <text
-	height="26"
-	top_delta="0"
-	left_pad="0"
-	name="weights_right"
-	width="70"
-	word_wrap="true" 
-	>
-[SIM]
-[EQ]
-  </text>
-
 <!--
   <text
 	height="65"
@@ -188,10 +59,18 @@ L$ [MODEL]
   </text>
     -->
 
+<panel
+ follows="all"
+ height="515"
+ layout="topleft"
+ left="3"
+ name="left_panel"
+ top="0"
+ width="305">
   <tab_container
-    follows="right|top|bottom"
+    follows="all"
     top="15"
-    left="310"
+    left="0"
     height="470"
     width="300"
     name="import_tab"
@@ -551,14 +430,171 @@ L$ [MODEL]
 	>
 	    Upload fee: L$ [FEE]
   </text>
+  </panel>
+
+<panel
+ follows="all"
+ height="515"
+ layout="topleft"
+ left_pad="1"
+ name="right_panel"
+ top="0"
+ width="310">
+
+  <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="model_category_label" text_color="White">
+    What does this model represent?
+  </text>
+  <combo_box top_pad="1" follows="left|top" height="23"
+	     name="model_category_combo"  width="200">
+    <combo_box.drop_down_button
+      label_color="White"/>
+    <combo_item name="Choose one" label="Choose One..." value="MUT_Unspecified"/>
+    <combo_item name="Avatar shape" label="Avatar shape" value="MUT_AvatarShape"/>
+    <combo_item name="Avatar attachment" label="Avatar attachment" value="MUT_AvatarAttachment"/>
+    <combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/>
+    <combo_item name="Moving object (vehicle, animal)" label="Moving object (vehicle, animal)" value="MUT_MovingObject"/>
+    <combo_item name="Large, non moving etc" label="Large, non moving etc" value="MUT_LargeStationary"/>
+    <combo_item name="Smaller, non-moving etc" label="Smaller, non-moving etc" value="MUT_SmallStationary"/>
+    <combo_item name="Not really any of these" label="Not really any of these" value="MUT_Other"/>
+  </combo_box>
+  
+  <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
+     font="SansSerif"
+	 bottom_delta="305"
+     left="15"
+     name="warning_title"
+     text_color="Yellow"
+     visible="true">
+     WARNING:
+    </text>
+    <text
+     text_color="White"
+     height="40"
+	 width="290"
+	 top_delta="15"
+     left_delta="0"
+     name="warning_message"
+     parse_urls="true"
+     wrap="true"
+     visible="true">
+     You will not be able to complete the final upload of this model to the Second Life servers. [[VURL] Find out how] to get enabled for mesh model uploads.</text>
+
+  <text
+	height="26"
+	top_pad="5"
+	left_delta="0"
+	name="weights_text_left"
+	width="80"
+	word_wrap="true"
+	>
+Download:
+Physics:
+  </text>
+  <text
+	height="26"
+	top_delta="0"
+	left_pad="0"
+	name="weights_left"
+	width="70"
+	word_wrap="true"
+	>
+[ST]
+[PH]
+  </text>
+  <text
+	height="26"
+	top_delta="0"
+	left_pad="0"
+	name="weights_text_right"
+	width="80"
+	word_wrap="true"
+	>
+Server:
+Prim equivs:
+  </text>
+  <text
+	height="26"
+	top_delta="0"
+	left_pad="0"
+	name="weights_right"
+	width="70"
+	word_wrap="true" 
+	>
+[SIM]
+[EQ]
+  </text>
+</panel>
+
+<panel
+ follows="bottom|left|right"
+ height="33"
+ layout="topleft"
+ left="0"
+ name="bottom_buttons_panel"
+ top_pad="1"
+ width="610">   
+  <button top="3" left="10"  follows="bottom|left" height="20" label="Set to defaults" width="100" name="reset_btn" tool_tip="Set to defaults"/>
+  <button top="3" left="310"  follows="bottom|right" height="20" label="Calculate weights &amp; fee" width="150" name="calculate_btn" tool_tip="Calculate weights &amp; fee"/>
+  <button top="3" left_delta="0"  follows="bottom|right" height="20" label="Upload" width="80" name="ok_btn" tool_tip="Upload to simulator" visible="false"/>
+  <button top="3" right="-10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn"/>
+</panel>
   
-  <button bottom="540" left="10"  follows="bottom|left" height="20" label="Set to defaults"
-	     width="100" name="reset_btn" tool_tip="Set to defaults"/>
-  <button left="310"  follows="bottom|right" height="20" label="Calculate weights &amp; fee"
-	     width="150" name="calculate_btn" tool_tip="Calculate weights &amp; fee" top_delta="0"/>
-  <button bottom="540" left="310"  follows="bottom|right" height="20" label="Upload"
-	     width="80" name="ok_btn" tool_tip="Upload to simulator" visible="false"/>
-  <button right="-10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn" top_delta="0"/>
+<panel
+ name="preview_panel"
+ left="320"
+ top="131"
+ bevel_style="none"
+ border_style="line"
+ border="true"
+ width="290"
+ height="290"
+ follows="all"/>  
   
   <!--
   <button bottom_delta="0" left="10" width="120" name="auto fill" label="Generate LOD" tool_tip="Automatically generate levels of detail"/>
-- 
cgit v1.2.3


From ca8a484f0ee4bcb9b68268f871082d4200062f0e Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Mon, 22 Aug 2011 19:18:36 +0300
Subject: SH-2169 FIXED Land impacts data added to build tools floater. Land
 selection moved from advanced weights floater to build tools floater. Removed
 selection observer from weights floater, selection data update in it is
 initiated from build floater.

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 03d6c84266..9b02f7d273 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -48,11 +48,11 @@
     </floater.string>
     <floater.string
      name="status_selectcount">
-        [OBJ_COUNT] objects ( [PRIM_COUNT] prims[PE_STRING] ) selected
+        [OBJ_COUNT] objects selected, land impact [LAND_IMPACT]
     </floater.string>
     <floater.string
-     name="status_selectprimequiv">
-        , [SEL_WEIGHT] prim equivs
+     name="status_remaining_capacity">
+        Remaining capacity [LAND_CAPACITY].
     </floater.string>
     <button
      follows="left|top"
@@ -738,11 +738,11 @@
 	  font="SansSerifSmall"
 	  layout="topleft"
 	  left="10"
-	  name="selection_weight"
+	  name="remaining_capacity"
 	  top_pad="0"
 	  visible="false"
 	  width="280">
-	  Physics weight [PHYS_WEIGHT], Render Cost [DISP_WEIGHT]. [secondlife:///app/openfloater/object_weights More info]
+	  [CAPACITY_STRING] [secondlife:///app/openfloater/object_weights More info]
 	</text>
     <!-- <text -->
     <!-- text_color="LtGray_50" -->
-- 
cgit v1.2.3


From e58d50e509d060320174c80af647da6ff9a3839f Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Tue, 23 Aug 2011 17:21:20 +0300
Subject: SH-2169 ADDITIONAL FIX Fixed SLURL showing context-specific help for
 object weights floater.

---
 indra/newview/skins/default/xui/en/floater_object_weights.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_object_weights.xml b/indra/newview/skins/default/xui/en/floater_object_weights.xml
index a73db3af32..eb283a1043 100644
--- a/indra/newview/skins/default/xui/en/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/en/floater_object_weights.xml
@@ -3,7 +3,7 @@
  can_close="true"
  can_tear_off="false"
  height="315"
- help_topic="objects_weight_floater"
+ help_topic="object_weights"
  layout="topleft"
  name="object_weights"
  save_rect="true"
@@ -337,6 +337,6 @@
      left="10"
      name="help_SLURL"
      top_pad="10"
-     value="[secondlife:///www.secondlife.com What is all this?...]"
+     value="[secondlife:///app/help/object_weights What is all this?...]"
      width="180" />
 </floater>
-- 
cgit v1.2.3


From 716d2bd2e4a2d556e98a1ac50262a01b5244d442 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Wed, 24 Aug 2011 14:57:19 +0300
Subject: SH-2309 WIP Priority modifications to mesh uploader UI

- Arranged all controls of the floater (according to the last version of the mockup) except for the tab container content.
---
 .../skins/default/xui/en/floater_model_preview.xml | 1315 ++++++++++----------
 1 file changed, 625 insertions(+), 690 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 8f6058a824..963938e20a 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1,7 +1,7 @@
 <?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"
+     can_resize="true" height="650" min_height="550" min_width="620"
+     name="Model Preview" title="Upload Model" width="840"
       help_topic="upload_model" >
 
   <string name="status_idle">Idle</string>
@@ -25,718 +25,653 @@
   <string name="decomposing">Analyzing...</string>
   <string name="simplifying">Simplifying...</string>
   <string name="tbd">TBD</string>
-  
-
-<!--
-  <text
-	height="65"
-	top_delta="0"
-	left_delta="70"
-	name="price_breakdown_text"
-	width="80"
-	word_wrap="true" 
-	>
-Streaming:
-Physics:
-Instances:
-Textures:
-Model:
-  </text>
-
-  <text
-	height="65"
-	top_delta="0"
-	left_delta="80"
-	name="price_breakdown"
-	width="65"
-	word_wrap="true" 
-	>
-L$ [STREAMING]
-L$ [PHYSICS]
-L$ [INSTANCES]
-L$ [TEXTURES]
-L$ [MODEL]
-  </text>
-    -->
 
 <panel
- follows="all"
- height="515"
- layout="topleft"
- left="3"
- name="left_panel"
- top="0"
- width="305">
-  <tab_container
-    follows="all"
-    top="15"
-    left="0"
-    height="470"
-    width="300"
-    name="import_tab"
-    border="true"
-    tab_position="top">
-
-    <!-- LOD PANEL -->
+  follows="all"
+  height="625"
+  layout="topleft"
+  left="3"
+  name="left_panel"
+  top_pad="10"
+  width="530">
+    <panel
+      follows="all"
+      height="50"
+      layout="top|left"
+      left="3"
+      name="model_name_representation_panel"
+      width="525">
+        <text
+          follows="top|left"
+          layout="topleft"
+          height="15"
+          left="15"
+          name="name_label"
+          top="0"
+          width="290">
+          Name:
+        </text>
+        <line_editor
+          follows="top|left"
+          layout="topleft"
+          height="19"
+          max_length_bytes="64"
+          name="description_form"
+          prevalidate_callback="ascii"
+          top_pad="5"
+          width="290" />
+        <text
+          follows="left|top"
+          height="15"
+          layout="topleft"
+          left_pad="15"
+          name="model_category_label"
+          text_color="White"
+          top="0"
+          width="200">
+          What does this model represent?
+        </text>
+        <combo_box
+          follows="left|top"
+          height="23"
+          left_pad="10"
+          name="model_category_combo"
+          top_pad="10"
+          width="200">
+        <combo_box.drop_down_button
+          label_color="White"/>
+          <combo_item name="Choose one" label="Choose One..." value="MUT_Unspecified"/>
+          <combo_item name="Avatar shape" label="Avatar shape" value="MUT_AvatarShape"/>
+          <combo_item name="Avatar attachment" label="Avatar attachment" value="MUT_AvatarAttachment"/>
+          <combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/>
+          <combo_item name="Moving object (vehicle, animal)" label="Moving object (vehicle, animal)" value="MUT_MovingObject"/>
+          <combo_item name="Large, non moving etc" label="Large, non moving etc" value="MUT_LargeStationary"/>
+          <combo_item name="Smaller, non-moving etc" label="Smaller, non-moving etc" value="MUT_SmallStationary"/>
+          <combo_item name="Not really any of these" label="Not really any of these" value="MUT_Other"/>
+         </combo_box>
+    </panel>
+    <tab_container
+      follows="all"
+      top_pad="15"
+      left="0"
+      height="470"
+      width="525"
+      name="import_tab"
+      border="true"
+      tab_position="top">
+      <!-- LOD PANEL -->
     <panel
       border="true"
       label="Level of Detail"
       name="lod_panel"
       help_topic="upload_model_lod">
-
-      <!-- LOD TABLE-->
-      <panel
-        follows="top|left"
-        name="lod table"
-        left="0"
-        top="0"
-        width="300"
-        height="163"
-        visible="true"
-        border="true"
-        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-
-      <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" name="triangles" width="65" height="18" follows="left|top" value="Triangles"/>
-      <text valign="center" halign="center" bg_visible="true" left_pad="0" width="65" name="vertices" height="18" follows="left|top" value="Vertices"/>
-      <text valign="center" halign="center" left_pad="0" name="status" 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="230" height="28" follows="left|top" top_pad="-15" wrap="true" name="lod_status_message_text"/>
-      </panel>
-
-      <!-- LOD MESH-->
-      <panel
-        follows="top|left"
-        name="mesh"
-        left="0"
-        top_pad="0"
-        width="300"
-        height="237"
-        visible="true"
-        border="true"
-        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-
-      <text top_pad="5" left="10" name="mesh_label" 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" text_readonly_color="LabelDisabledColor">
-        Build Operator:  
-      </text>
-      <text follows="top|left" name="queue_mode_text" left_pad="5" width="100" height="15" text_readonly_color="LabelDisabledColor">
-        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" text_readonly_color="LabelDisabledColor">
-        Border Mode:
-      </text>
-
-      <text left_pad="5" name="share_tolderance_text"  follows="left|top" width="100" height="15" text_readonly_color="LabelDisabledColor">
-        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"/>
-      </panel>
-
-      <!-- LOD GENERATE NORMALS-->
-      <panel
-        follows="top|left"
-        name="generate normals"
-        left="0"
-        top_pad="0"
-        width="300"
-        height="46"
-        visible="true"
-        border="true"
-        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-
-      <text left="10" name="gen_normals_label" top_pad="5" 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>
+    <!-- LOD TABLE-->
+    <panel
+      follows="top|left"
+      name="lod table"
+      left="0"
+      top="0"
+      width="300"
+      height="163"
+      visible="true"
+      border="true"
+      bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
+    
+    <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" name="triangles" width="65" height="18" follows="left|top" value="Triangles"/>
+    <text valign="center" halign="center" bg_visible="true" left_pad="0" width="65" name="vertices" height="18" follows="left|top" value="Vertices"/>
+    <text valign="center" halign="center" left_pad="0" name="status" 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="230" height="28" follows="left|top" top_pad="-15" wrap="true" name="lod_status_message_text"/>
     </panel>
-
-    <!--  PANEL -->
+    
+    <!-- LOD MESH-->
     <panel
+      follows="top|left"
+      name="mesh"
+      left="0"
+      top_pad="0"
+      width="300"
+      height="237"
+      visible="true"
       border="true"
-      label="Physics"
-      name="physics_panel"
-      help_topic="upload_model_physics">
-
-      <!-- PHYSICS GEOMETRY-->
+      bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
+    
+    <text top_pad="5" left="10" name="mesh_label" 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" text_readonly_color="LabelDisabledColor">
+      Build Operator:  
+    </text>
+    <text follows="top|left" name="queue_mode_text" left_pad="5" width="100" height="15" text_readonly_color="LabelDisabledColor">
+      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" text_readonly_color="LabelDisabledColor">
+      Border Mode:
+    </text>
+    
+    <text left_pad="5" name="share_tolderance_text"  follows="left|top" width="100" height="15" text_readonly_color="LabelDisabledColor">
+      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"/>
+    </panel>
+    
+    <!-- LOD GENERATE NORMALS-->
+    <panel
+      follows="top|left"
+      name="generate normals"
+      left="0"
+      top_pad="0"
+      width="300"
+      height="46"
+      visible="true"
+      border="true"
+      bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
+    
+    <text left="10" name="gen_normals_label" top_pad="5" 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>
+      <!-- PHYSYCS PANEL -->
       <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="150" top="10" follows="left|top" height="18"
-	        name="physics_lod_combo" width="130" 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" name="method_label" font="SansSerifBig">
-          Step 1: Analysis
-        </text>
+        label="Physics"
+        name="physics_panel"
+        help_topic="upload_model_physics">
+    
+        <!-- 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="150" top="10" follows="left|top" height="18"
+ 	         name="physics_lod_combo" width="130" 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" name="method_label" font="SansSerifBig">
+            Step 1: Analysis
+          </text>
+          
+          <text name="analysis_method_label" 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" name="quality_label" 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>
         
-        <text name="analysis_method_label" 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" name="quality_label" 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"/>
+    
+        <!-- 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" name="second_step_label" font="SansSerifBig">
+            Step 2: Simplification
+          </text>
+    
+          <text left="10" name="simp_method_header" 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">
+          
+          <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>
-      
-
-      <!-- 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" name="second_step_label" font="SansSerifBig">
-          Step 2: Simplification
-        </text>
-
-        <text left="10" name="simp_method_header" 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 -->
+      <!-- MODIFIERS 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>
-
-
+       border="true"
+       label="Modifiers"
+       name="modifiers_panel"
+       help_topic="upload_model_modifiers">
+         <text left="10" name="scale_label" width="90" bottom="30" follows="top|left" height="15">
+           Scale:
+         </text>
+         <text left_pad="5" name="dimensions_label" 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" width="140" name="import_dimensions" follows="top|left">
+           [X] x [Y] x [Z] m
+         </text>
+         
+         <text left="10" name="include_label" 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" name="pelvis_offset_label" 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>
-    </panel>
-
-    <!-- MODIFIERS PANEL -->
+    </tab_container>
     <panel
-      border="true"
-      label="Modifiers"
-      name="modifiers_panel"
-      help_topic="upload_model_modifiers">
-
-      <text left="10" name="scale_label" width="90" bottom="30" follows="top|left" height="15">
-        Scale:
-      </text>
-      <text left_pad="5" name="dimensions_label" 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" width="140" name="import_dimensions" follows="top|left">
-        [X] x [Y] x [Z] m
-      </text>
-
-      <text left="10" name="include_label" 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" name="pelvis_offset_label" 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"/>
-
+     follows="all"
+     height="80"
+     layout="top|left"
+     left="3"
+     name="weights_and_warning_panel"
+     top_pad="3"
+     width="525">
+       <button
+         follows="top|left"
+         label="Calculate weights &amp; fee"
+         layout="topleft"
+         left="3"
+         name="calculate_btn"
+         top="3"
+         height="20"
+         width="150"
+         tool_tip="Calculate weights &amp;fee"/>
+       <button
+         follows="top|left"
+         label="Cancel"
+         layout="topleft"
+         left_pad="6"
+         name="cancel_btn"
+         top="3"
+         height="20"
+         width="80"/>
+       <button
+         follows="top|left"
+         label="Upload"
+         layout="topleft"
+         left="35"
+         name="ok_btn"
+         top="3"
+         height="20"
+         visible="false"
+         width="80"
+         tool_tip="Upload to simulator"/>
+       <button
+         follows="top|right"
+         label="Clear settings &amp; reset form"
+         layout="topleft"
+         name="reset_btn"
+         right="-2"
+         top="3"
+         height="20"
+         width="155"/>
+       <!-- ========== WEIGHTS ==========-->
+       <text
+         follows="top|left"
+         height="15"
+         layout="topleft"
+         left="5"
+         name="upload_fee"
+         top_pad="8"
+         width="130"
+         word_wrap="true">
+         Upload fee: L$ [FEE]
+       </text>
+       <text
+         height="15"
+         layout="topleft"
+         left_pad="0"
+         name="prim_weight"
+         top_delta="0"
+         width="120"
+         word_wrap="true">
+         Land impact: [EQ]
+       </text>
+       <text
+         height="15"
+         layout="topleft"
+         left_pad="0"
+         name="download_weight"
+         top_delta="0"
+         width="100"
+         word_wrap="true">
+         Download: [ST]
+       </text>
+       <text
+         height="15"
+         top_delta="0"
+         layout="topleft"
+         left_pad="0"
+         name="physics_weight"
+         width="90"
+         word_wrap="true">
+         Physics: [PH]
+       </text>
+       <text
+         height="15"
+         top_delta="0"
+         layout="topleft"
+         left_pad="0"
+         name="server_weight"
+         width="83"
+         word_wrap="true">
+         Server: [SIM]
+       </text>
+       <!-- ========== NOTE MESSAGE ========== -->
+       <text
+         font="SansSerif"
+         layout="topleft"
+         left="6"
+         name="warning_title"
+         top_pad="10"
+         text_color="Yellow"
+         visible="true"
+         width="40">
+         NOTE:
+       </text>
+       <text
+         text_color="White"
+         height="20"
+         layout="topleft"
+         left_pad="1"
+         name="warning_message"
+         parse_urls="true"
+         top_delta="0"
+         wrap="true"
+         width="462"
+         visible="true">
+         You dont have rights to upload mesh models. [[VURL] Find out how] to get certified.
+       </text>
     </panel>
-  </tab_container>
-
-  <text
-	height="16"
-	left_delta="5"
-	bottom_delta="30"
-	name="upload_fee"
-	width="300"
-	follows="bottom|right"
-	word_wrap="true" 
-	>
-	    Upload fee: L$ [FEE]
-  </text>
-  </panel>
+</panel>
 
+<text 
+ follows="left|top"
+ layout="topleft"
+ left="540"
+ name="lod_label"
+ top="13"
+ height="15"
+ width="290">
+ Preview:
+ </text>
 <panel
+ border="true"
+ bevel_style="none"
  follows="all"
- height="515"
- layout="topleft"
- left_pad="1"
- name="right_panel"
- top="0"
- width="310">
-
-  <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="model_category_label" text_color="White">
-    What does this model represent?
-  </text>
-  <combo_box top_pad="1" follows="left|top" height="23"
-	     name="model_category_combo"  width="200">
-    <combo_box.drop_down_button
-      label_color="White"/>
-    <combo_item name="Choose one" label="Choose One..." value="MUT_Unspecified"/>
-    <combo_item name="Avatar shape" label="Avatar shape" value="MUT_AvatarShape"/>
-    <combo_item name="Avatar attachment" label="Avatar attachment" value="MUT_AvatarAttachment"/>
-    <combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/>
-    <combo_item name="Moving object (vehicle, animal)" label="Moving object (vehicle, animal)" value="MUT_MovingObject"/>
-    <combo_item name="Large, non moving etc" label="Large, non moving etc" value="MUT_LargeStationary"/>
-    <combo_item name="Smaller, non-moving etc" label="Smaller, non-moving etc" value="MUT_SmallStationary"/>
-    <combo_item name="Not really any of these" label="Not really any of these" value="MUT_Other"/>
-  </combo_box>
-  
-  <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"/>-->
+ name="preview_panel"
+ top_pad="4"
+ width="290"
+ height="290"/>
 
+<panel
+  follows="all"
+  height="130"
+  layout="topleft"
+  name="right_panel"
+  top_pad="5"
+  width="290">
+    <combo_box
+      top_pad="3"
+      follows="left|top"
+      height="18"
+      layout="topleft"
+      name="preview_lod_combo"
+      width="120"
+      tool_tip="LOD to view in preview render">
+        <combo_item name="high">   High  LoD   </combo_item>
+        <combo_item name="medium"> Medium LoD  </combo_item>
+        <combo_item name="low">    Low LoD     </combo_item>
+        <combo_item name="lowest"> Lowest  LoD </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"
+      top_delta="0"
+      name="options_gear_btn"
+      width="31"
+      height="25"/>
     <text
-     font="SansSerif"
-	 bottom_delta="305"
-     left="15"
-     name="warning_title"
-     text_color="Yellow"
-     visible="true">
-     WARNING:
+      follows="top|left"
+      layout="topleft"
+      top="5"
+      left_pad="10"
+      name="label_display"
+      width="50">
+      Display...
     </text>
+    <check_box
+      follows="top|left"
+      label="Edges"
+      layout="topleft"
+      left_delta="0"
+      name="disp_edges_chb"
+      top_pad="8">
+    </check_box>
+    <check_box
+      follows="top|left"
+      label="Physics"
+      layout="topleft"
+      name="disp_physics_chb"
+      top_pad="8">
+    </check_box>
+    <check_box
+      follows="top|left"
+      label="Textures"
+      layout="topleft"
+      name="disp_textures_chb"
+      top_pad="8">
+    </check_box>
+    <check_box
+      follows="top|left"
+      label="Skin weights"
+      layout="topleft"
+      name="disp_skin_chb"
+      top_pad="8">
+    </check_box>
+    <check_box
+      follows="top|left"
+      label="Joints"
+      layout="topleft"
+      name="disp_joints_chb"
+      top_pad="8">
+    </check_box>
     <text
-     text_color="White"
-     height="40"
-	 width="290"
-	 top_delta="15"
-     left_delta="0"
-     name="warning_message"
-     parse_urls="true"
-     wrap="true"
-     visible="true">
-     You will not be able to complete the final upload of this model to the Second Life servers. [[VURL] Find out how] to get enabled for mesh model uploads.</text>
-
-  <text
-	height="26"
-	top_pad="5"
-	left_delta="0"
-	name="weights_text_left"
-	width="80"
-	word_wrap="true"
-	>
-Download:
-Physics:
-  </text>
-  <text
-	height="26"
-	top_delta="0"
-	left_pad="0"
-	name="weights_left"
-	width="70"
-	word_wrap="true"
-	>
-[ST]
-[PH]
-  </text>
-  <text
-	height="26"
-	top_delta="0"
-	left_pad="0"
-	name="weights_text_right"
-	width="80"
-	word_wrap="true"
-	>
-Server:
-Prim equivs:
-  </text>
-  <text
-	height="26"
-	top_delta="0"
-	left_pad="0"
-	name="weights_right"
-	width="70"
-	word_wrap="true" 
-	>
-[SIM]
-[EQ]
-  </text>
-</panel>
-
-<panel
- follows="bottom|left|right"
- height="33"
- layout="topleft"
- left="0"
- name="bottom_buttons_panel"
- top_pad="1"
- width="610">   
-  <button top="3" left="10"  follows="bottom|left" height="20" label="Set to defaults" width="100" name="reset_btn" tool_tip="Set to defaults"/>
-  <button top="3" left="310"  follows="bottom|right" height="20" label="Calculate weights &amp; fee" width="150" name="calculate_btn" tool_tip="Calculate weights &amp; fee"/>
-  <button top="3" left_delta="0"  follows="bottom|right" height="20" label="Upload" width="80" name="ok_btn" tool_tip="Upload to simulator" visible="false"/>
-  <button top="3" right="-10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn"/>
+      follows="top|left"
+      layout="topleft"
+      left="2"
+      name="physics_explode_label"
+      top="85">
+      Preview Spread:
+    </text>
+    <slider
+      name="physics_explode"
+      follows="top|left"
+      top="100"
+      left="0"
+      min_val="0.0"
+      max_val="3.0"
+      height="20"
+      width="150"/>
 </panel>
-  
-<panel
- name="preview_panel"
- left="320"
- top="131"
- bevel_style="none"
- border_style="line"
- border="true"
- width="290"
- height="290"
- follows="all"/>  
-  
-  <!--
-  <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>
-- 
cgit v1.2.3


From 124e4d587491668354cd9910cea07d299464108e Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 25 Aug 2011 21:33:10 +0300
Subject: SH-2309 WIP Priority modifications to mesh uploader UI

- Updated upload floater according to the UI spec

- Updated Modifiers panel according to the UI spec
---
 .../skins/default/xui/en/floater_model_preview.xml | 213 +++++++++++++--------
 1 file changed, 134 insertions(+), 79 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 963938e20a..2436c48b0f 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1,6 +1,6 @@
 <?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="650" min_height="550" min_width="620"
+     can_resize="false" height="480" min_height="480" min_width="840"
      name="Model Preview" title="Upload Model" width="840"
       help_topic="upload_model" >
 
@@ -27,8 +27,8 @@
   <string name="tbd">TBD</string>
 
 <panel
-  follows="all"
-  height="625"
+  follows="top|left"
+  height="455"
   layout="topleft"
   left="3"
   name="left_panel"
@@ -49,7 +49,7 @@
           name="name_label"
           top="0"
           width="290">
-          Name:
+          Model name:
         </text>
         <line_editor
           follows="top|left"
@@ -69,7 +69,7 @@
           text_color="White"
           top="0"
           width="200">
-          What does this model represent?
+          This model represent...
         </text>
         <combo_box
           follows="left|top"
@@ -91,13 +91,12 @@
          </combo_box>
     </panel>
     <tab_container
-      follows="all"
+      follows="top|left"
       top_pad="15"
       left="0"
-      height="470"
+      height="300"
       width="525"
       name="import_tab"
-      border="true"
       tab_position="top">
       <!-- LOD PANEL -->
     <panel
@@ -105,7 +104,7 @@
       label="Level of Detail"
       name="lod_panel"
       help_topic="upload_model_lod">
-    <!-- LOD TABLE-->
+     LOD TABLE
     <panel
       follows="top|left"
       name="lod table"
@@ -157,7 +156,7 @@
     <text left_pad="5" width="230" height="28" follows="left|top" top_pad="-15" wrap="true" name="lod_status_message_text"/>
     </panel>
     
-    <!-- LOD MESH-->
+     LOD MESH
     <panel
       follows="top|left"
       name="mesh"
@@ -239,7 +238,7 @@
     <spinner follows="left|top" name="share_tolerance" left_pad="5" width="100" decimal_digits="5" initial_value="0.00001" height="20"/>
     </panel>
     
-    <!-- LOD GENERATE NORMALS-->
+     LOD GENERATE NORMALS
     <panel
       follows="top|left"
       name="generate normals"
@@ -262,22 +261,28 @@
       </panel>
       <!-- PHYSYCS PANEL -->
       <panel
-        border="true"
         label="Physics"
         name="physics_panel"
         help_topic="upload_model_physics">
-    
-        <!-- PHYSICS GEOMETRY-->
+         <view_border
+          bevel_style="none"
+          follows="top|left"
+          height="275"
+          layout="topleft"
+          left="3"
+          name="physics_tab_border"
+          top_pad="0"
+          width="519"/>
+         PHYSICS GEOMETRY
         <panel
           follows="top|left"
           name="physics geometry"
-          left="0"
+          left="3"
           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">
+          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:"/>
@@ -303,14 +308,14 @@
           <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-->
+         PHYSICS ANALYSIS
         <panel
          follows="top|left"
          name="physics analysis"
@@ -319,8 +324,7 @@
          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">
+         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" name="method_label" font="SansSerifBig">
             Step 1: Analysis
@@ -344,7 +348,7 @@
         </panel>
         
     
-        <!-- PHYSICS SIMPLIFICATION -->
+         PHYSICS SIMPLIFICATION 
        <panel
          follows="top|left"
          name="physics simplification"
@@ -353,8 +357,7 @@
          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">
+         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" name="second_step_label" font="SansSerifBig">
             Step 2: Simplification
@@ -374,7 +377,7 @@
           
         </panel>
     
-        <!-- INFO PANEL -->
+         INFO PANEL 
         <panel
           left="0"
           top_pad="0"
@@ -383,8 +386,7 @@
           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">
+          bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
           
           <text follows="top|left" name="physics_triangles" top_pad="10" height="15" left="10">
             Triangles: [TRIANGLES]
@@ -401,43 +403,107 @@
       </panel>
       <!-- MODIFIERS PANEL -->
       <panel
-       border="true"
        label="Modifiers"
        name="modifiers_panel"
        help_topic="upload_model_modifiers">
-         <text left="10" name="scale_label" width="90" bottom="30" follows="top|left" height="15">
-           Scale:
-         </text>
-         <text left_pad="5" name="dimensions_label" 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" width="140" name="import_dimensions" follows="top|left">
-           [X] x [Y] x [Z] m
-         </text>
-         
-         <text left="10" name="include_label" 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" name="pelvis_offset_label" 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>
+         <view_border
+          bevel_style="none"  
+          follows="top|left"
+          height="275"
+          layout="topleft"
+          left="3"
+          name="border"
+          top_pad="0"
+          width="519"/>
+           <text
+             follows="top|left"
+             height="16"
+             left="10"
+             name="scale_label"
+             top="25"
+             width="140">
+             Scale (1=no change):
+           </text>
+           <spinner
+             height="20"
+             follows="top|left"
+             left_pad="10"
+             max_val="64.0"
+             min_val="0.01"
+             name="import_scale"
+             top_delta="-4"
+             value="1.0"
+             width="80"/>
+           <text
+             follows="top|left"
+             height="15"
+             left_pad="5"
+             name="dimensions_label"
+             width="90">
+             Dimensions:
+           </text>
+           <text
+             follows="top|left"
+             height="15"
+             left_pad="0"
+             name="import_dimensions"
+             width="140">
+             [X] X [Y] X [Z]
+           </text>
+           <text
+             follows="top|left"
+             height="15"
+             left="10"
+             name="include_label"
+             top_pad="20"
+             width="150">
+             Include in upload:
+           </text>
+           <check_box
+             height="15"
+             follows="top|left"
+             name="upload_textures"
+             label="Textures"
+             left_delta="0"
+             top_pad="10"/>
+           <check_box
+             follows="top|left"
+             height="15"
+             label="Skin weight"
+             name="upload_skin"
+             top_pad="10"/>
+           <check_box
+             follows="top|left"
+             height="15"
+             label="Joint positions"
+             name="upload_joints"
+             top_pad="10"/>
+           <text
+             follows="top|left"
+             height="15"
+             layout="topleft"
+             left="200"
+             name="pelvis_offset_label"
+             top="61"
+             width="200">
+             Z Offset (for avatar shapes only):
+           </text>
+           <spinner
+             follows="top|left"
+             height="20"
+             min_val="-3.00"
+             max_val="3.0"
+             name="pelvis_offset"
+             top_pad="10"
+             value="0.0"
+             width="80"/>
+       </panel>
     </tab_container>
     <panel
-     follows="all"
+     follows="top|left"
      height="80"
      layout="top|left"
-     left="3"
+     left="0"
      name="weights_and_warning_panel"
      top_pad="3"
      width="525">
@@ -573,7 +639,7 @@
 <panel
  border="true"
  bevel_style="none"
- follows="all"
+ follows="top|left"
  name="preview_panel"
  top_pad="4"
  width="290"
@@ -592,30 +658,18 @@
       height="18"
       layout="topleft"
       name="preview_lod_combo"
-      width="120"
+      width="150"
       tool_tip="LOD to view in preview render">
         <combo_item name="high">   High  LoD   </combo_item>
         <combo_item name="medium"> Medium LoD  </combo_item>
         <combo_item name="low">    Low LoD     </combo_item>
         <combo_item name="lowest"> Lowest  LoD </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"
-      top_delta="0"
-      name="options_gear_btn"
-      width="31"
-      height="25"/>
     <text
       follows="top|left"
       layout="topleft"
       top="5"
-      left_pad="10"
+      left_pad="20"
       name="label_display"
       width="50">
       Display...
@@ -625,35 +679,35 @@
       label="Edges"
       layout="topleft"
       left_delta="0"
-      name="disp_edges_chb"
+      name="show_edges"
       top_pad="8">
     </check_box>
     <check_box
       follows="top|left"
       label="Physics"
       layout="topleft"
-      name="disp_physics_chb"
+      name="show_physics"
       top_pad="8">
     </check_box>
     <check_box
       follows="top|left"
       label="Textures"
       layout="topleft"
-      name="disp_textures_chb"
+      name="show_textures"
       top_pad="8">
     </check_box>
     <check_box
       follows="top|left"
       label="Skin weights"
       layout="topleft"
-      name="disp_skin_chb"
+      name="show_skin_weight"
       top_pad="8">
     </check_box>
     <check_box
       follows="top|left"
       label="Joints"
       layout="topleft"
-      name="disp_joints_chb"
+      name="show_joint_positions"
       top_pad="8">
     </check_box>
     <text
@@ -661,7 +715,8 @@
       layout="topleft"
       left="2"
       name="physics_explode_label"
-      top="85">
+      top="85"
+      width="150">
       Preview Spread:
     </text>
     <slider
-- 
cgit v1.2.3


From 2df669c402b5344397499186e73d0886dd5da4d1 Mon Sep 17 00:00:00 2001
From: prep linden <prep@lindenlab.com>
Date: Tue, 30 Aug 2011 10:46:41 -0400
Subject: Log error message if material list is not a subset of reference model

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 7c6896becf..259d2e70b6 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -21,6 +21,7 @@
   <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="mesh_status_invalid_material_list">LOD materials are not a subset of reference model.</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>
-- 
cgit v1.2.3


From 55c220779223682260c5299ec13c17d19bf6ca4e Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Wed, 31 Aug 2011 17:02:15 +0300
Subject: SH-2309 WIP Priority modifications to mesh uploader UI

Made next changes according to the last version of UI spec:

- Modified Upload Options tab
- Modified Physics tab
- Modified the floater overall
---
 indra/newview/skins/default/colors.xml             |   3 +
 .../skins/default/xui/en/floater_model_preview.xml | 588 ++++++++++++++-------
 2 files changed, 414 insertions(+), 177 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 31b6fc77f5..041b72a28e 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -84,6 +84,9 @@
 	name="LtYellow"
 	value="1 1 .79 1" />
 	<color
+	name="DrYellow"
+	value="1 0.86 0 1" />
+	<color
 	name="LtOrange"
 	value="1 .85 .73 1" />
 	<color
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 2436c48b0f..ac3978938a 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="480" min_height="480" min_width="840"
-     name="Model Preview" title="Upload Model" width="840"
+     can_resize="false" height="480" min_height="480" min_width="940"
+     name="Model Preview" title="Upload Model" width="940"
       help_topic="upload_model" >
 
   <string name="status_idle">Idle</string>
@@ -33,7 +33,7 @@
   left="3"
   name="left_panel"
   top_pad="10"
-  width="530">
+  width="630">
     <panel
       follows="all"
       height="50"
@@ -47,6 +47,7 @@
           height="15"
           left="15"
           name="name_label"
+          text_color="White"
           top="0"
           width="290">
           Model name:
@@ -83,8 +84,8 @@
           <combo_item name="Choose one" label="Choose One..." value="MUT_Unspecified"/>
           <combo_item name="Avatar shape" label="Avatar shape" value="MUT_AvatarShape"/>
           <combo_item name="Avatar attachment" label="Avatar attachment" value="MUT_AvatarAttachment"/>
-          <combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/>
           <combo_item name="Moving object (vehicle, animal)" label="Moving object (vehicle, animal)" value="MUT_MovingObject"/>
+          <combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/>
           <combo_item name="Large, non moving etc" label="Large, non moving etc" value="MUT_LargeStationary"/>
           <combo_item name="Smaller, non-moving etc" label="Smaller, non-moving etc" value="MUT_SmallStationary"/>
           <combo_item name="Not really any of these" label="Not really any of these" value="MUT_Other"/>
@@ -95,7 +96,7 @@
       top_pad="15"
       left="0"
       height="300"
-      width="525"
+      width="625"
       name="import_tab"
       tab_position="top">
       <!-- LOD PANEL -->
@@ -260,150 +261,356 @@
     </panel>
       </panel>
       <!-- PHYSYCS PANEL -->
-      <panel
-        label="Physics"
-        name="physics_panel"
-        help_topic="upload_model_physics">
-         <view_border
-          bevel_style="none"
-          follows="top|left"
-          height="275"
-          layout="topleft"
-          left="3"
-          name="physics_tab_border"
-          top_pad="0"
-          width="519"/>
-         PHYSICS GEOMETRY
-        <panel
-          follows="top|left"
-          name="physics geometry"
-          left="3"
-          top="0"
-          width="300"
-          height="65"
-          visible="true"
-          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="150" top="10" follows="left|top" height="18"
- 	         name="physics_lod_combo" width="130" 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"
-         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" name="method_label" font="SansSerifBig">
-            Step 1: Analysis
-          </text>
-          
-          <text name="analysis_method_label" 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" name="quality_label" 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"
-         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" name="second_step_label" font="SansSerifBig">
-            Step 2: Simplification
-          </text>
-    
-          <text left="10" name="simp_method_header" 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"
-          bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-          
-          <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>
-    
-    
+          help_topic="upload_model_physics"
+          label="Physics"
+          name="physics_panel">
+            
+            <!-- ==== STEP 1: Level of Detail ==== -->
+            <view_border
+              bevel_style="none"
+              follows="top|left"
+              height="275"
+              layout="topleft"
+              left="3"
+              name="physics_tab_border"
+              top_pad="0"
+              width="619"/>
+                <panel
+                  bg_alpha_color="0 0 0 0"
+                  bg_opaque_color="0 0 0 0.3"
+                  follows="top|left"
+                  height="21"
+                  left="18"
+                  name="physics geometry"
+                  top="15"
+                  visible="true"
+                  width="589">
+                    <text
+                      follows="top|left"
+                      font="SansSerif"
+                      height="20"
+                      layout="topleft"
+                      left="0"
+                      name="first_step_name"
+                      text_color="White"
+                      top_pad="0"
+                      width="210">
+                      Step 1: Level of Detail
+                    </text>
+                    <combo_box
+                      follows="left|top"
+                      height="18"
+                      left_pad="10"
+                      name="physics_lod_combo"
+                      width="130"
+                      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_item name="load_from_file"> From file   </combo_item>
+                    </combo_box>
+                    <line_editor
+                      follows="left|top"
+                      left_pad="10"
+                      value=""
+                      name="physics_file"
+                      height="20"
+                      width="154"/>
+                    <button
+                      follows="left|top"
+                      height="20"
+                      left_pad="4"
+                      name="physics_browse"
+                      label="Browse..."
+                      width="70"/>
+                    <!-- <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>
+            
+            <!-- ==== STEP 2: Analyse ==== -->
+            <view_border
+              bevel_style="none"
+              follows="top|left"
+              height="0"
+              layout="topleft"
+              left="18"
+              name="physics_tab_border"
+              top_pad="15"
+              width="589"/>
+                <panel
+                  bg_alpha_color="0 0 0 0"
+                  bg_opaque_color="0 0 0 0.3"
+                  height="65"
+                  follows="top|left"
+                  left="18"
+                  name="physics analysis"
+                  top_pad="15"
+                  visible="true"
+                  width="589">
+                    <text
+                      follows="left|top"
+                      font="SansSerif"
+                      height="20"
+                      layout="topleft"
+                      left="0"
+                      name="method_label"
+                      text_color="White"
+                      top_pad="0">
+                      Step 2: Analyse
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      layout="topleft"
+                      name="analysis_method_label"
+                      top_pad="10"
+                      width="100">
+                      Method:
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      name="quality_label"
+                      layout="topleft"
+                      left_pad="15"
+                      width="100">
+                      Quality:
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      name="smooth_method_label"
+                      layout="topleft"
+                      left_pad="15"
+                      width="100">
+                      Smooth:
+                    </text>
+                    <combo_box
+                      follows="top|left"
+                      layout="topleft"
+                      left="0"
+                      name="Method"
+                      top_pad="0"
+                      height="20"
+                      width="100"/>
+                    <combo_box
+                      follows="top|left"
+                      layout="topleft"
+                      left_pad="15"
+                      name="Decompose Quality"
+                      height="20"
+                      width="100"/>
+                    <combo_box
+                      height="20"
+                      follows="top|left"
+                      layout="topleft"
+                      left_pad="15"
+                      name="Smooth"
+                      width="100"/>
+                    <check_box
+                      follows="top|left"
+                      label="Close Holes"
+                      layout="topleft"
+                      left_pad="10"
+                      name="Close Holes (Slow)"
+                      height="15"/>
+                    <button
+                      bottom="1"
+                      follows="top|right"
+                      height="20"
+                      label="Analyze"
+                      layout="bottomleft"
+                      name="Decompose"
+                      right="-1"
+                      width="90"/>
+                    <button
+                      follows="top|left"
+                      height="20"
+                      label="Cancel"
+                      layout="topleft"
+                      left_delta="0"
+                      name="decompose_cancel"
+                      visible="false"
+                      width="90"/>
+                </panel>
+            
+            <!-- ==== STEP 3: Simplify ==== -->
+            <view_border
+              bevel_style="none"
+              follows="top|left"
+              height="0"
+              layout="topleft"
+              left="18"
+              name="physics_tab_border"
+              top_pad="15"
+              width="589"/>
+                <panel
+                  bg_alpha_color="0 0 0 0"
+                  bg_opaque_color="0 0 0 0.3"
+                  follows="top|left"
+                  height="66"
+                  left="18"
+                  name="physics simplification"
+                  top_pad="15"
+                  width="589">
+                    <text
+                      text_color="White"
+                      follows="left|top"
+                      height="20"
+                      left="0"
+                      name="second_step_label"
+                      top_pad="0"
+                      font="SansSerif">
+                      Step 3: Simplify
+                    </text>
+                    <text
+                      name="simp_method_header"
+                      top_pad="10"
+                      height="15"
+                      width="100"
+                      follows="top|left">
+                      Method:
+                    </text>
+                    <text
+                      follows="top|left"
+                      left_pad="40"
+                      name="pass_method_header"
+                      height="15"
+                      width="41">
+                      Passes:
+                    </text>
+                    <text
+                      follows="top|left"
+                      left_pad="40"
+                      name="Detail Scale label"
+                      height="15"
+                      width="80">
+                      Detail scale:
+                    </text>
+                    <text
+                      follows="top|left"
+                      left_delta="0"
+                      name="Retain%_label"
+                      height="15"
+                      width="80"
+                      visible="false">
+                      Retain:
+                    </text>
+                    <combo_box
+                      follows="top|left"
+                      height="20"
+                      left="0"
+                      name="Simplify Method"
+                      top_pad="0"
+                      width="100"/>
+                    <combo_box
+                      height="20"
+                      follows="top|left"
+                      left_pad="40"
+                      name="Combine Quality"
+                      width="41"
+                      value="1">
+                    </combo_box>
+                    <spinner
+                      follows="top|left"
+                      name="Detail Scale"
+                      height="20"
+                      left_pad="40"
+                      width="60"/>
+                    <spinner
+                      name="Retain%"
+                      width="60"
+                      follows="top|left"
+                      height="20"
+                      left_delta="0"
+                      visible="false"/>
+                    <button
+                      follows="top|left"
+                      height="20"
+                      label="Simplify"
+                      left_pad="40"
+                      name="Simplify"
+                      width="90"/>
+                    <button
+                      follows="top|left"
+                      height="20"
+                      label="Cancel"
+                      layout="topleft"
+                      left_delta="0"
+                      name="simplify_cancel"
+                      width="90"/>
+                </panel>
+            
+            <!-- ==== Results ==== -->
+            <view_border
+              bevel_style="none"
+              follows="top|left"
+              height="0"
+              layout="topleft"
+              left="18"
+              name="physics_tab_border"
+              top_pad="15"
+              width="589"/>
+                <panel
+                  bg_alpha_color="0 0 0 0"
+                  bg_opaque_color="0 0 0 0.3"
+                  follows="left|top"
+                  height="16"
+                  layout="topleft"
+                  left="18"
+                  name="physics info"
+                  top_pad="15"
+                  width="589">
+                    <text
+                      follows="top|left"
+                      height="15"
+                      layout="topleft"
+                      left="0"
+                      text_color="White"
+                      top_pad="0"
+                      name="results_text"
+                      width="60">
+                      Results:
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      layout="topleft"
+                      left_pad="0"
+                      text_color="White"
+                      top_delta="0"
+                      name="physics_triangles"
+                      width="130">
+                      Triangles: [TRIANGLES],
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      layout="topleft"
+                      left_pad="0"
+                      name="physics_points"
+                      top_delta="0"
+                      text_color="White"
+                      width="105">
+                      Vertices: [POINTS],
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      layout="topleft"
+                      left_pad="0"
+                      name="physics_hulls"
+                      top_delta="0"
+                      text_color="White">
+                      Hulls: [HULLS]
+                    </text>
+                </panel>
         </panel>
-      </panel>
       <!-- MODIFIERS PANEL -->
-      <panel
-       label="Modifiers"
+     <panel
+       label="Upload options"
        name="modifiers_panel"
        help_topic="upload_model_modifiers">
          <view_border
@@ -414,15 +621,16 @@
           left="3"
           name="border"
           top_pad="0"
-          width="519"/>
+          width="619"/>
            <text
              follows="top|left"
              height="16"
-             left="10"
+             left="20"
              name="scale_label"
-             top="25"
+             text_color="White"
+             top="15"
              width="140">
-             Scale (1=no change):
+             Scale (1=no scaling):
            </text>
            <spinner
              height="20"
@@ -437,8 +645,9 @@
            <text
              follows="top|left"
              height="15"
-             left_pad="5"
+             left_pad="20"
              name="dimensions_label"
+             text_color="White"
              width="90">
              Dimensions:
            </text>
@@ -447,46 +656,60 @@
              height="15"
              left_pad="0"
              name="import_dimensions"
+             text_color="White"
              width="140">
              [X] X [Y] X [Z]
            </text>
+           <check_box
+             height="15"
+             follows="top|left"
+             name="upload_textures"
+             label="Include textures"
+             label_text.text_color="White"
+             left="20"
+             top_pad="20"/>
+           <view_border
+             bevel_style="none"
+             follows="top|left"
+             height="0"
+             layout="topleft"
+             name="border"
+             top_pad="20"
+             width="579"/>
            <text
              follows="top|left"
              height="15"
-             left="10"
+             left="20"
              name="include_label"
+             text_color="White"
              top_pad="20"
              width="150">
-             Include in upload:
+             For avatar models only:
            </text>
-           <check_box
-             height="15"
-             follows="top|left"
-             name="upload_textures"
-             label="Textures"
-             left_delta="0"
-             top_pad="10"/>
            <check_box
              follows="top|left"
              height="15"
-             label="Skin weight"
+             label="Include skin weight"
+             label_text.text_color="White"
              name="upload_skin"
-             top_pad="10"/>
+             top_pad="15"/>
            <check_box
              follows="top|left"
              height="15"
-             label="Joint positions"
+             label="Include joint positions"
+             label_text.text_color="White"
              name="upload_joints"
-             top_pad="10"/>
+             top_pad="15"/>
            <text
              follows="top|left"
              height="15"
              layout="topleft"
-             left="200"
+             left="220"
              name="pelvis_offset_label"
-             top="61"
+             text_color="White"
+             top="134"
              width="200">
-             Z Offset (for avatar shapes only):
+             Z offset (raise or lower avatar):
            </text>
            <spinner
              follows="top|left"
@@ -497,7 +720,7 @@
              top_pad="10"
              value="0.0"
              width="80"/>
-       </panel>
+     </panel>
     </tab_container>
     <panel
      follows="top|left"
@@ -506,10 +729,11 @@
      left="0"
      name="weights_and_warning_panel"
      top_pad="3"
-     width="525">
+     width="625">
        <button
          follows="top|left"
          label="Calculate weights &amp; fee"
+         label_color="White"
          layout="topleft"
          left="3"
          name="calculate_btn"
@@ -520,6 +744,7 @@
        <button
          follows="top|left"
          label="Cancel"
+         label_color="White"
          layout="topleft"
          left_pad="6"
          name="cancel_btn"
@@ -530,6 +755,7 @@
          follows="top|left"
          label="Upload"
          layout="topleft"
+         label_color="White"
          left="35"
          name="ok_btn"
          top="3"
@@ -540,6 +766,7 @@
        <button
          follows="top|right"
          label="Clear settings &amp; reset form"
+         label_color="White"
          layout="topleft"
          name="reset_btn"
          right="-2"
@@ -553,7 +780,7 @@
          layout="topleft"
          left="5"
          name="upload_fee"
-         top_pad="8"
+         top_pad="10"
          width="130"
          word_wrap="true">
          Upload fee: L$ [FEE]
@@ -605,7 +832,7 @@
          left="6"
          name="warning_title"
          top_pad="10"
-         text_color="Yellow"
+         text_color="DrYellow"
          visible="true"
          width="40">
          NOTE:
@@ -617,7 +844,7 @@
          left_pad="1"
          name="warning_message"
          parse_urls="true"
-         top_delta="0"
+         top_delta="2"
          wrap="true"
          width="462"
          visible="true">
@@ -629,8 +856,9 @@
 <text 
  follows="left|top"
  layout="topleft"
- left="540"
+ left="640"
  name="lod_label"
+ text_color="White"
  top="13"
  height="15"
  width="290">
@@ -660,14 +888,15 @@
       name="preview_lod_combo"
       width="150"
       tool_tip="LOD to view in preview render">
-        <combo_item name="high">   High  LoD   </combo_item>
-        <combo_item name="medium"> Medium LoD  </combo_item>
-        <combo_item name="low">    Low LoD     </combo_item>
-        <combo_item name="lowest"> Lowest  LoD </combo_item>
+        <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>
     <text
       follows="top|left"
       layout="topleft"
+      text_color="White"
       top="5"
       left_pad="20"
       name="label_display"
@@ -677,6 +906,7 @@
     <check_box
       follows="top|left"
       label="Edges"
+      label_text.text_color="White"
       layout="topleft"
       left_delta="0"
       name="show_edges"
@@ -685,6 +915,7 @@
     <check_box
       follows="top|left"
       label="Physics"
+      label_text.text_color="White"
       layout="topleft"
       name="show_physics"
       top_pad="8">
@@ -692,6 +923,7 @@
     <check_box
       follows="top|left"
       label="Textures"
+      label_text.text_color="White"
       layout="topleft"
       name="show_textures"
       top_pad="8">
@@ -699,6 +931,7 @@
     <check_box
       follows="top|left"
       label="Skin weights"
+      label_text.text_color="White"
       layout="topleft"
       name="show_skin_weight"
       top_pad="8">
@@ -706,6 +939,7 @@
     <check_box
       follows="top|left"
       label="Joints"
+      label_text.text_color="White"
       layout="topleft"
       name="show_joint_positions"
       top_pad="8">
-- 
cgit v1.2.3


From 18b47df3e27bcd93a41699c166deb3df39767963 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Wed, 31 Aug 2011 18:24:56 -0600
Subject: fix for SH-2367: Model upload errors are not displayed

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 259d2e70b6..522ffa7232 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -4,8 +4,8 @@
      name="Model Preview" title="Upload Model" width="620"
       help_topic="upload_model" >
 
-  <string name="status_idle">Idle</string>
-  <string name="status_parse_error">Dae parsing issue - see log for details.</string>
+  <string name="status_idle"></string>
+  <string name="status_parse_error">Error: Dae parsing issue - see log for details.</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>
@@ -112,6 +112,8 @@
      visible="false">
      You will not be able to complete the final upload of this model to the Second Life servers. [[VURL] Find out how] to get enabled for mesh model uploads.</text>
 
+  <text text_color="Yellow" left="10" bottom_delta="0" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>
+  
   <text
 	height="26"
 	top_pad="5"
-- 
cgit v1.2.3


From 004de653aa3aa2702c7532d2ff5ce9838636d4ca Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 1 Sep 2011 19:01:46 +0300
Subject: SH-2309 WIP Priority modifications to mesh uploader UI

- Bind "Cosine%" param with "Smooth" combo box.
- Corrected some wording.
- Little UI polish. Line with results in Physics tab.
- Changed ordering of LOD combo box items.
---
 .../skins/default/xui/en/floater_model_preview.xml       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index ac3978938a..d613e42786 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -70,7 +70,7 @@
           text_color="White"
           top="0"
           width="200">
-          This model represent...
+          This model represents...
         </text>
         <combo_box
           follows="left|top"
@@ -305,10 +305,10 @@
                       name="physics_lod_combo"
                       width="130"
                       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_item name="physics_medium"> Medium </combo_item>
+                        <combo_item name="physics_low">    Low    </combo_item>
+                        <combo_item name="physics_lowest"> Lowest </combo_item>
                         <combo_item name="load_from_file"> From file   </combo_item>
                     </combo_box>
                     <line_editor
@@ -407,7 +407,7 @@
                       follows="top|left"
                       layout="topleft"
                       left_pad="15"
-                      name="Smooth"
+                      name="Cosine%"
                       width="100"/>
                     <check_box
                       follows="top|left"
@@ -571,7 +571,7 @@
                       text_color="White"
                       top_pad="0"
                       name="results_text"
-                      width="60">
+                      width="50">
                       Results:
                     </text>
                     <text
@@ -582,7 +582,7 @@
                       text_color="White"
                       top_delta="0"
                       name="physics_triangles"
-                      width="130">
+                      width="90">
                       Triangles: [TRIANGLES],
                     </text>
                     <text
@@ -593,7 +593,7 @@
                       name="physics_points"
                       top_delta="0"
                       text_color="White"
-                      width="105">
+                      width="85">
                       Vertices: [POINTS],
                     </text>
                     <text
-- 
cgit v1.2.3


From 5da2d4c85370ebe1a14ecbebd8e5df7965e9d02e Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 2 Sep 2011 17:14:07 +0300
Subject: SH-2309 WIP Priority modifications to mesh uploader UI

- Changed representation of Retain% control values

- Added "Choose one..." item to the LOD combo_box
---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index d613e42786..39ef844824 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -305,6 +305,7 @@
                       name="physics_lod_combo"
                       width="130"
                       tool_tip="LOD to use for physics shape">
+                        <combo_item name="choose_one">     Choose one...   </combo_item>
                         <combo_item name="physics_high">   High   </combo_item>
                         <combo_item name="physics_medium"> Medium </combo_item>
                         <combo_item name="physics_low">    Low    </combo_item>
@@ -521,6 +522,7 @@
                       width="60"/>
                     <spinner
                       name="Retain%"
+                      decimal_digits="0"
                       width="60"
                       follows="top|left"
                       height="20"
-- 
cgit v1.2.3


From 028c34e0ffd69eeb99f21f8c0bb9b612bd820b10 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Fri, 2 Sep 2011 17:36:54 +0300
Subject: SH-2309 Model preview floater LoD tab updated. - Combo boxes for LoD
 source added for each level - New option "Use LoD above" added for copying
 the model from higher LoDs. - Various LoD settings and related controls
 removed.

---
 .../skins/default/xui/en/floater_model_preview.xml | 790 ++++++++++++++++-----
 1 file changed, 630 insertions(+), 160 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 39ef844824..21feb9908e 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -100,166 +100,636 @@
       name="import_tab"
       tab_position="top">
       <!-- LOD PANEL -->
-    <panel
-      border="true"
-      label="Level of Detail"
-      name="lod_panel"
-      help_topic="upload_model_lod">
-     LOD TABLE
-    <panel
-      follows="top|left"
-      name="lod table"
-      left="0"
-      top="0"
-      width="300"
-      height="163"
-      visible="true"
-      border="true"
-      bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-    
-    <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" name="triangles" width="65" height="18" follows="left|top" value="Triangles"/>
-    <text valign="center" halign="center" bg_visible="true" left_pad="0" width="65" name="vertices" height="18" follows="left|top" value="Vertices"/>
-    <text valign="center" halign="center" left_pad="0" name="status" 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="230" height="28" follows="left|top" top_pad="-15" wrap="true" name="lod_status_message_text"/>
-    </panel>
-    
-     LOD MESH
-    <panel
-      follows="top|left"
-      name="mesh"
-      left="0"
-      top_pad="0"
-      width="300"
-      height="237"
-      visible="true"
-      border="true"
-      bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-    
-    <text top_pad="5" left="10" name="mesh_label" 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" text_readonly_color="LabelDisabledColor">
-      Build Operator:  
-    </text>
-    <text follows="top|left" name="queue_mode_text" left_pad="5" width="100" height="15" text_readonly_color="LabelDisabledColor">
-      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" text_readonly_color="LabelDisabledColor">
-      Border Mode:
-    </text>
-    
-    <text left_pad="5" name="share_tolderance_text"  follows="left|top" width="100" height="15" text_readonly_color="LabelDisabledColor">
-      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"/>
-    </panel>
-    
-     LOD GENERATE NORMALS
-    <panel
-      follows="top|left"
-      name="generate normals"
-      left="0"
-      top_pad="0"
-      width="300"
-      height="46"
-      visible="true"
-      border="true"
-      bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-    
-    <text left="10" name="gen_normals_label" top_pad="5" 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
+         help_topic="upload_model_lod"
+         label="Level of Detail"
+         layout="topleft"
+         name="lod_panel"
+         title="Level of Detail">
+            <view_border
+             bevel_style="none"
+             follows="top|left"
+             height="275"
+             layout="topleft"
+             left="3"
+             name="lod_tab_border"
+             top_pad="0"
+             width="619" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             height="18"
+             initial_value="Source"
+             layout="topleft"
+             left="75"
+             name="source"
+             top="15"
+             valign="center"
+             value="Source"
+             width="335" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="Triangles"
+             layout="topleft"
+             left_pad="0"
+             name="triangles"
+             top_delta="0"
+             valign="center"
+             value="Triangles"
+             width="65" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="Vertices"
+             layout="topleft"
+             left_pad="0"
+             name="vertices"
+             valign="center"
+             value="Vertices"
+             width="65" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             height="18"
+             initial_value="High"
+             layout="topleft"
+             left="10"
+             name="high_label"
+             top_pad="10"
+             valign="center"
+             value="High"
+             width="65" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left_pad="0"
+             name="lod_source_high"
+             top_delta="-3"
+             width="135">
+                <item
+                 id="Load from file"
+                 value="Load from file" />
+                <item
+                 id="Generate"
+                 value="Generate" />
+            </combo_box>
+            <line_editor
+             follows="left|top"
+             height="20"
+             initial_value=""
+             layout="topleft"
+             left_pad="5"
+             name="lod_file_high"
+             top_delta="0"
+             value=""
+             width="120" />
+            <button
+             follows="left|top"
+             height="20"
+             label="Browse..."
+             layout="topleft"
+             left_pad="5"
+             name="lod_browse_high"
+             top_delta="0"
+             width="70" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left="215"
+             name="lod_mode_high"
+             top_delta="0"
+             visible="false"
+             width="135">
+                <item
+                 id="Triangle Limit"
+                 value="Triangle Limit" />
+                <item
+                 id="Error Threshold"
+                 value="Error Threshold" />
+            </combo_box>
+            <spinner
+             decimal_digits="0"
+             follows="top|left"
+             height="20"
+             increment="10"
+             layout="topleft"
+             left_pad="5"
+             name="lod_triangle_limit_high"
+             visible="false"
+             width="55" />
+            <spinner
+             follows="top|left"
+             height="20"
+             increment="0.01"
+             layout="topleft"
+             left_delta="0"
+             max_val="100"
+             name="lod_error_threshold_high"
+             top_delta="0"
+             visible="false"
+             width="55" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="high_triangles"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="high_vertices"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="center"
+             height="18"
+             initial_value=""
+             layout="topleft"
+             left_pad="0"
+             name="high_status"
+             valign="center"
+             value=""
+             width="65" />
+            <icon
+             height="16"
+             image_name="lag_status_critical.tga"
+             layout="topleft"
+             left_delta="20"
+             mouse_opaque="true"
+             name="status_icon_high"
+             top_delta="0"
+             width="16" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             height="18"
+             initial_value="Medium"
+             layout="topleft"
+             left="10"
+             name="medium_label"
+             top_pad="15"
+             valign="center"
+             value="Medium"
+             width="65" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left_pad="0"
+             name="lod_source_medium"
+             top_delta="-3"
+             width="135">
+                <item
+                 id="Load from file"
+                 value="Load from file" />
+                <item
+                 id="Generate"
+                 value="Generate" />
+                <item
+                 id="Use LoD above"
+                 value="Use LoD above" />
+            </combo_box>
+            <line_editor
+             follows="left|top"
+             height="20"
+             initial_value=""
+             layout="topleft"
+             left_pad="5"
+             name="lod_file_medium"
+             top_delta="0"
+             value=""
+             visible="false"
+             width="120" />
+            <button
+             follows="left|top"
+             height="20"
+             label="Browse..."
+             layout="topleft"
+             left_pad="5"
+             name="lod_browse_medium"
+             top_delta="0"
+             visible="false"
+             width="70" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left="215"
+             name="lod_mode_medium"
+             top_delta="0"
+             width="135">
+                <item
+                 id="Triangle Limit"
+                 value="Triangle Limit" />
+                <item
+                 id="Error Threshold"
+                 value="Error Threshold" />
+            </combo_box>
+            <spinner
+             decimal_digits="0"
+             follows="top|left"
+             height="20"
+             increment="10"
+             layout="topleft"
+             left_pad="5"
+             name="lod_triangle_limit_medium"
+             width="55" />
+            <spinner
+             follows="top|left"
+             height="20"
+             increment="0.01"
+             layout="topleft"
+             left_delta="0"
+             max_val="100"
+             name="lod_error_threshold_medium"
+             top_delta="0"
+             visible="false"
+             width="55" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="medium_triangles"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="medium_vertices"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="center"
+             height="18"
+             initial_value=""
+             layout="topleft"
+             left_pad="0"
+             name="medium_status"
+             valign="center"
+             value=""
+             width="65" />
+            <icon
+             height="16"
+             image_name="lag_status_critical.tga"
+             layout="topleft"
+             left_delta="20"
+             mouse_opaque="true"
+             name="status_icon_medium"
+             top_delta="0"
+             width="16" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             height="18"
+             initial_value="Low"
+             layout="topleft"
+             left="10"
+             name="low_label"
+             top_pad="15"
+             valign="center"
+             value="Low"
+             width="65" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left_pad="0"
+             name="lod_source_low"
+             top_delta="-3"
+             width="135">
+                <item
+                 id="Load from file"
+                 value="Load from file" />
+                <item
+                 id="Generate"
+                 value="Generate" />
+                <item
+                 id="Use LoD above"
+                 value="Use LoD above" />
+            </combo_box>
+            <line_editor
+             follows="left|top"
+             height="20"
+             initial_value=""
+             layout="topleft"
+             left_pad="5"
+             name="lod_file_low"
+             top_delta="0"
+             value=""
+             visible="false"
+             width="120" />
+            <button
+             follows="left|top"
+             height="20"
+             label="Browse..."
+             layout="topleft"
+             left_pad="5"
+             name="lod_browse_low"
+             top_delta="0"
+             visible="false"
+             width="70" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left="215"
+             name="lod_mode_low"
+             top_delta="0"
+             width="135">
+                <item
+                 id="Triangle Limit"
+                 value="Triangle Limit" />
+                <item
+                 id="Error Threshold"
+                 value="Error Threshold" />
+            </combo_box>
+            <spinner
+             decimal_digits="0"
+             follows="top|left"
+             height="20"
+             increment="10"
+             layout="topleft"
+             left_pad="5"
+             name="lod_triangle_limit_low"
+             width="55" />
+            <spinner
+             follows="top|left"
+             height="20"
+             increment="0.01"
+             layout="topleft"
+             left_delta="0"
+             max_val="100"
+             name="lod_error_threshold_low"
+             top_delta="0"
+             visible="false"
+             width="55" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="low_triangles"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="low_vertices"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="center"
+             height="18"
+             initial_value=""
+             layout="topleft"
+             left_pad="0"
+             name="low_status"
+             valign="center"
+             value=""
+             width="65" />
+            <icon
+             height="16"
+             image_name="lag_status_critical.tga"
+             layout="topleft"
+             left_delta="20"
+             mouse_opaque="true"
+             name="status_icon_low"
+             top_delta="0"
+             width="16" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             height="18"
+             initial_value="Lowest"
+             layout="topleft"
+             left="10"
+             name="lowest_label"
+             top_pad="15"
+             valign="center"
+             value="Lowest"
+             width="65" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left_pad="0"
+             name="lod_source_lowest"
+             top_delta="-3"
+             width="135">
+                <item
+                 id="Load from file"
+                 value="Load from file" />
+                <item
+                 id="Generate"
+                 value="Generate" />
+                <item
+                 id="Use LoD above"
+                 value="Use LoD above" />
+            </combo_box>
+            <line_editor
+             follows="left|top"
+             height="20"
+             initial_value=""
+             layout="topleft"
+             left_pad="5"
+             name="lod_file_lowest"
+             top_delta="0"
+             value=""
+             visible="false"
+             width="120" />
+            <button
+             follows="left|top"
+             height="20"
+             label="Browse..."
+             layout="topleft"
+             left_pad="5"
+             name="lod_browse_lowest"
+             top_delta="0"
+             visible="false"
+             width="70" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left="215"
+             name="lod_mode_lowest"
+             top_delta="0"
+             width="135">
+                <item
+                 id="Triangle Limit"
+                 value="Triangle Limit" />
+                <item
+                 id="Error Threshold"
+                 value="Error Threshold" />
+            </combo_box>
+            <spinner
+             decimal_digits="0"
+             follows="top|left"
+             height="20"
+             increment="10"
+             layout="topleft"
+             left_pad="5"
+             name="lod_triangle_limit_lowest"
+             width="55" />
+            <spinner
+             follows="top|left"
+             height="20"
+             increment="0.01"
+             layout="topleft"
+             left_delta="0"
+             max_val="100"
+             name="lod_error_threshold_lowest"
+             top_delta="0"
+             visible="false"
+             width="55" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="lowest_triangles"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="lowest_vertices"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             bg_visible="true"
+             follows="left|top"
+             halign="center"
+             height="18"
+             initial_value=""
+             layout="topleft"
+             left_pad="0"
+             name="lowest_status"
+             valign="center"
+             value=""
+             width="65" />
+            <icon
+             height="16"
+             image_name="lag_status_critical.tga"
+             layout="topleft"
+             left_delta="20"
+             mouse_opaque="true"
+             name="status_icon_lowest"
+             top_delta="0"
+             width="16" />
+            <icon
+             height="16"
+             layout="topleft"
+             left="10"
+             name="lod_status_message_icon"
+             top_pad="20"
+             width="16" />
+            <text
+             follows="left|top"
+             height="16"
+             layout="topleft"
+             left_pad="5"
+             name="lod_status_message_text"
+             top_delta="0"
+             width="584"
+             word_wrap="true"
+             wrap="true" />
+            <view_border
+             bevel_style="none"
+             follows="top|left"
+             height="0"
+             layout="topleft"
+             left="10"
+             name="lod_tab_border"
+             top_pad="20"
+             width="605" />
+            <check_box
+             follows="top|left"
+             height="15"
+             label="Generate Normals"
+             layout="topleft"
+             left="10"
+             name="gen_normals"
+             top_pad="20" />
+            <text
+             enabled="false"
+             follows="top|left"
+             height="15"
+             initial_value="Crease Angle:"
+             layout="topleft"
+             left="200"
+             name="crease_label"
+             top_delta="0"
+             value="Crease Angle:"
+             width="100" />
+            <spinner
+             enabled="false"
+             follows="top|left"
+             height="20"
+             initial_value="75"
+             layout="topleft"
+             left_pad="5"
+             max_val="180"
+             name="crease_angle"
+             value="75"
+             width="60" />
+        </panel>
       <!-- PHYSYCS PANEL -->
         <panel
           help_topic="upload_model_physics"
-- 
cgit v1.2.3


From b782f9b0b48b8cb48b306b871aa02c97f3b82c34 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Fri, 2 Sep 2011 20:04:48 +0300
Subject: SH-2309 WIP Label colors changed in mesh upload floater.

---
 indra/newview/skins/default/colors.xml             |  3 +++
 .../skins/default/xui/en/floater_model_preview.xml | 26 ++++++----------------
 2 files changed, 10 insertions(+), 19 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 041b72a28e..e51c50d977 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -510,6 +510,9 @@
     <color
      name="MenuPopupBgColor"
 	  reference="DkGray2" />
+    <color
+     name="ModelUploaderLabels"
+     value="1 0.6 0 1" />	  
     <color
      name="MultiSliderDisabledThumbColor"
      reference="Black" />
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 21feb9908e..2fa994dfbf 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -116,19 +116,18 @@
              top_pad="0"
              width="619" />
             <text
-             bg_visible="true"
              follows="left|top"
              height="18"
              initial_value="Source"
              layout="topleft"
              left="75"
              name="source"
+             text_color="ModelUploaderLabels"
              top="15"
              valign="center"
              value="Source"
              width="335" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -136,12 +135,12 @@
              layout="topleft"
              left_pad="0"
              name="triangles"
+             text_color="ModelUploaderLabels"
              top_delta="0"
              valign="center"
              value="Triangles"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -149,17 +148,18 @@
              layout="topleft"
              left_pad="0"
              name="vertices"
+             text_color="ModelUploaderLabels"
              valign="center"
              value="Vertices"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              height="18"
              initial_value="High"
              layout="topleft"
              left="10"
              name="high_label"
+             text_color="ModelUploaderLabels"
              top_pad="10"
              valign="center"
              value="High"
@@ -236,7 +236,6 @@
              visible="false"
              width="55" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -248,7 +247,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -260,7 +258,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="center"
              height="18"
@@ -281,13 +278,13 @@
              top_delta="0"
              width="16" />
             <text
-             bg_visible="true"
              follows="left|top"
              height="18"
              initial_value="Medium"
              layout="topleft"
              left="10"
              name="medium_label"
+             text_color="ModelUploaderLabels"
              top_pad="15"
              valign="center"
              value="Medium"
@@ -367,7 +364,6 @@
              visible="false"
              width="55" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -379,7 +375,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -391,7 +386,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="center"
              height="18"
@@ -412,13 +406,13 @@
              top_delta="0"
              width="16" />
             <text
-             bg_visible="true"
              follows="left|top"
              height="18"
              initial_value="Low"
              layout="topleft"
              left="10"
              name="low_label"
+             text_color="ModelUploaderLabels"
              top_pad="15"
              valign="center"
              value="Low"
@@ -498,7 +492,6 @@
              visible="false"
              width="55" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -510,7 +503,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -522,7 +514,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="center"
              height="18"
@@ -543,13 +534,13 @@
              top_delta="0"
              width="16" />
             <text
-             bg_visible="true"
              follows="left|top"
              height="18"
              initial_value="Lowest"
              layout="topleft"
              left="10"
              name="lowest_label"
+             text_color="ModelUploaderLabels"
              top_pad="15"
              valign="center"
              value="Lowest"
@@ -629,7 +620,6 @@
              visible="false"
              width="55" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -641,7 +631,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -653,7 +642,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="center"
              height="18"
-- 
cgit v1.2.3


From aaee960dd3a2d3da51db6b8ba7a6f5b1f414aef5 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Tue, 6 Sep 2011 20:16:51 +0300
Subject: SH-2309 New icons added to mesh upload floater.

---
 indra/newview/skins/default/textures/green_checkmark.png  | Bin 0 -> 414 bytes
 indra/newview/skins/default/textures/red_x.png            | Bin 0 -> 624 bytes
 indra/newview/skins/default/textures/textures.xml         |   4 ++--
 .../skins/default/xui/en/floater_model_preview.xml        |   8 ++++----
 4 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/green_checkmark.png
 create mode 100644 indra/newview/skins/default/textures/red_x.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/green_checkmark.png b/indra/newview/skins/default/textures/green_checkmark.png
new file mode 100644
index 0000000000..d2a5b348dc
Binary files /dev/null and b/indra/newview/skins/default/textures/green_checkmark.png differ
diff --git a/indra/newview/skins/default/textures/red_x.png b/indra/newview/skins/default/textures/red_x.png
new file mode 100644
index 0000000000..a61202f09b
Binary files /dev/null and b/indra/newview/skins/default/textures/red_x.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 799cd907dc..8078766203 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -279,9 +279,9 @@ with the same filename but different name
 
   <texture name="menu_separator" file_name="navbar/FileMenu_Divider.png" scale.left="4" scale.top="166" scale.right="0" scale.bottom="0" />
 
-  <texture name="ModelImport_Status_Good" file_name="lag_status_good.tga" preload="false"/>
+  <texture name="ModelImport_Status_Good" file_name="green_checkmark.png" preload="false"/>
   <texture name="ModelImport_Status_Warning" file_name="lag_status_warning.tga" preload="false"/>
-  <texture name="ModelImport_Status_Error" file_name="lag_status_critical.tga" preload="false"/>
+  <texture name="ModelImport_Status_Error" file_name="red_x.png" preload="false"/>
   
   <texture name="MouseLook_View_Off" file_name="bottomtray/MouseLook_view_off.png" preload="false" />
   <texture name="MouseLook_View_On" file_name="bottomtray/MouseLook_view_on.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 2fa994dfbf..9dc928b474 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -270,7 +270,7 @@
              width="65" />
             <icon
              height="16"
-             image_name="lag_status_critical.tga"
+             image_name="red_x.png"
              layout="topleft"
              left_delta="20"
              mouse_opaque="true"
@@ -398,7 +398,7 @@
              width="65" />
             <icon
              height="16"
-             image_name="lag_status_critical.tga"
+             image_name="red_x.png"
              layout="topleft"
              left_delta="20"
              mouse_opaque="true"
@@ -526,7 +526,7 @@
              width="65" />
             <icon
              height="16"
-             image_name="lag_status_critical.tga"
+             image_name="red_x.png"
              layout="topleft"
              left_delta="20"
              mouse_opaque="true"
@@ -654,7 +654,7 @@
              width="65" />
             <icon
              height="16"
-             image_name="lag_status_critical.tga"
+             image_name="red_x.png"
              layout="topleft"
              left_delta="20"
              mouse_opaque="true"
-- 
cgit v1.2.3


From 0e4586a42f754775e27405d0a572ff5962d5a951 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Wed, 7 Sep 2011 20:53:44 +0300
Subject: SH-2371 FIXED "Not allowed to upload message" flashes when uploader
 dialog comes up

- This is a regression bug caused by changeset:20407
---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index df4c66c5b6..cae6445b02 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1296,7 +1296,7 @@
          name="warning_title"
          top_pad="10"
          text_color="DrYellow"
-         visible="true"
+         visible="false"
          width="40">
          NOTE:
        </text>
@@ -1310,7 +1310,7 @@
          top_delta="2"
          wrap="true"
          width="462"
-         visible="true">
+         visible="false">
          You dont have rights to upload mesh models. [[VURL] Find out how] to get certified.
        </text>
     </panel>
-- 
cgit v1.2.3


From 2c16ad9339107aa23a650f9b22ba269da1fd2034 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Tue, 13 Sep 2011 15:33:31 -0400
Subject: SH-2420 FIX update labeling in about land floater

About land was still referring to the capacity of land in terms of "prims"
The new terminology refers to this as land capacity, so that we can get
away from the "prim equivalent" terms, as they are confusing.
---
 indra/newview/skins/default/xui/en/floater_about_land.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 07cb4c12f5..e5dcc9bcb5 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -834,7 +834,7 @@
              name="Simulator primitive usage:"
              top_pad="4"
              width="364">
-               Primitive usage:
+               Region capacity:
             </text>
             <text
              type="string"
@@ -858,7 +858,7 @@
              name="Primitives parcel supports:"
              top="44"
              width="152">
-                Prims parcel supports:
+                Parcel land capacity:
             </text>
             <text
              type="string"
@@ -882,7 +882,7 @@
              name="Primitives on parcel:"
              top="64"
              width="152">
-                Prims on parcel:
+                Parcel land impact:
             </text>
             <text
              type="string"
@@ -2179,4 +2179,4 @@ Only large parcels can be listed in search.
              </panel>
         </panel>
     </tab_container>
-</floater>
\ No newline at end of file
+</floater>
-- 
cgit v1.2.3


From 0d9e46ab0b065d72e0c8d45a773ebbbd71563060 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 21 Sep 2011 11:16:26 -0400
Subject: SH-2432 FIX - moved status line to lower part of dialog

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_model_preview.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
old mode 100644
new mode 100755
index cae6445b02..2eea286c8b
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -27,8 +27,6 @@
   <string name="simplifying">Simplifying...</string>
   <string name="tbd">TBD</string>
 
-  <text text_color="Yellow" left="10" bottom_delta="0" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>
-  
 <panel
   follows="top|left"
   height="455"
@@ -1313,6 +1311,8 @@
          visible="false">
          You dont have rights to upload mesh models. [[VURL] Find out how] to get certified.
        </text>
+       <text text_color="Yellow" layout="topleft" top_delta="20" left="6" name="status">[STATUS]</text>
+  
     </panel>
 </panel>
 
-- 
cgit v1.2.3