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/default/xui/en')

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/default/xui/en')

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/default/xui/en')

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/default/xui/en')

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