SH-2059 FIXED Mesh uploader UI clean up.

- When the “Load from file” radio is selected, the labels uner it are disabled.
- Added horizontal lines to LoD tab like in the physics tab.
- Physics tab: LoD dropdown moved to the left, against the “Use Level of Detail” label.
- Modifiers tab: fixed dimensions to show a z value.

1 files changed, 50 insertions, 11 deletions

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>