merge

4 files changed, 244 insertions, 111 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index b8030bfa91..e522159181 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -256,6 +256,10 @@ 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_Warning" file_name="lag_status_warning.tga" preload="false"/>
+  <texture name="ModelImport_Status_Error" file_name="lag_status_critical.tga" 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 779eeacb43..952deb26f9 100644
--- 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="520" min_height="520" min_width="630"
-     name="Model Preview" title="Upload Model" width="630">
+     can_resize="true" height="550" min_height="550" min_width="620"
+     name="Model Preview" title="Upload Model" width="620">
 
   <string name="status_idle">Idle</string>
   <string name="status_reading_file">Loading...</string>
@@ -10,103 +10,89 @@
   <string name="medium">Medium</string>
   <string name="low">Low</string>
   <string name="lowest">Lowest</string>
-  <string name="mesh_status_good">Good</string>
-  <string name="mesh_status_bad">Bad</string>"
+  <string name="mesh_status_good">Ship it!</string>
   <string name="mesh_status_na">N/A</string>
   <string name="mesh_status_none">None</string>
+  <string name="mesh_status_submesh_mismatch">Levels of detail have a different number of textureable faces.</string>
+  <string name="mesh_status_mesh_mismatch">Levels of detail have a different number of mesh instances.</string>
+  <string name="mesh_status_too_many_vertices">Level of detail has too many vertices.</string>
+  <string name="mesh_status_missing_lod">Missing required level of detail.</string>
   <string name="layer_all">All</string> <!-- Text to display in physics layer combo box for "all layers" -->
 
   <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="254"
-	     name="description_form" width="310" />
-  <text bottom_delta="24" follows="top|left" height="15" name="preview_label">
+  <line_editor bottom_delta="20" follows="top|left|right" height="19" 
+	     name="description_form" width="290" />
+  
+  <text bottom_delta="20" left="15" follows="left|top" height="15" name="lod_label">
     Preview:
   </text>
+  <combo_box bottom_delta="20" follows="left|top" height="18"
+	     name="preview_lod_combo" width="240" tool_tip="LOD to view in preview render">
+    <combo_item name="lowest">
+      Level of Detail: Lowest
+    </combo_item>
+    <combo_item name="low">
+      Level of Detail: Low
+    </combo_item>
+    <combo_item name="medium">
+      Level of Detail: Medium
+    </combo_item>
+    <combo_item name="high">
+      Level of Detail: High
+    </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"
-    width="310"
-    height="310"
+    width="290"
+    height="290"
     follows="all"/>
 
-  <text bottom_delta="25" left="15" width="100"  follows="bottom|left" height="15" name="streaming cost">
-    Prim Cost: [COST]
-  </text>
-
-  <text right="320" width="100" height="15" bottom_delta="0" follows="bottom|right" name="status">[STATUS]</text>
-
-  <text bottom_delta="20" left="15" follows="left|bottom" height="15" name="lod_label">
-    Level of Detail:
-  </text>
-  <combo_box bottom_delta="20" follows="left|bottom" list_position="below" height="18"
-	     name="preview_lod_combo" width="90" tool_tip="LOD to view in preview render">
-    <combo_item name="high">
-      High
-    </combo_item>
-    <combo_item name="medium">
-      Medium
-    </combo_item>
-    <combo_item name="lowest">
-      Lowest
-    </combo_item>
-    <combo_item name="low">
-      Low
-    </combo_item>
-  </combo_box>
-
-  <check_box bottom="450" left="125" follows="left|bottom" label="Show Edges" name="show edges" width="120" height="16" tool_tip="Render wireframe in preview window"/>
-  <check_box bottom_delta="15" left="125" follows="left|bottom" label="Show Physics" name="show physics" width="120" height="16" tool_tip="Show physics shape."/>
+  <text bottom_delta="25" left="25" width="100" follows="bottom|left">Upload Details</text>
+  <panel top_pad="5" border="true" left="15" width="290" height="70" follows="bottom|left"
+          bevel_style="in" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
+    <text left="25" follows="bottom|left" width="140" height="15" name="streaming cost">
+      Resource Cost: [COST]
+    </text>
+    <text left="25" top_pad="5" width="140" follows="bottom|left" height="15" name="physics cost">
+      Physics Cost: Unknown
+    </text>
+    <text left="25" top_pad="5" follows="bottom|left" height="15" name="upload fee">
+      Upload Fee: N/A
+    </text>
+  </panel>
+
+  <text left="10" bottom="540" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>
 
-  <button bottom="510" follows="bottom|left" height="20" label="Upload"
-	     left="15" width="80" name="ok_btn" tool_tip="Upload to simulator"/>
-  <button left_pad="10" follows="left|bottom" height="20" width="80" label="Cancel" name="cancel_btn"/>
+  
+  <button bottom="540" left="430"  follows="bottom|right" height="20" label="Upload"
+	     width="80" name="ok_btn" tool_tip="Upload to simulator"/>
+  <button left_pad="10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn"/>
 
   <tab_container
     follows="right|top|bottom"
     top="15"
-    left="330"
-    height="475"
-    width="280"
+    left="310"
+    height="470"
+    width="300"
     name="import_tab"
     border="true"
     tab_position="top">
 
-    <!-- MODIFIERS PANEL -->
-    <panel
-      border="true"
-      label="Modifiers"
-      name="modifiers_panel"
-      left="330"
-      width="280"
-      height="450">
-
-      <text left="10" width="90" bottom="30" follows="top|left" height="15">
-        Scale:
-      </text>
-      <text left_pad="5" width="140" follows="top|left" height="15">
-        Dimensions:
-      </text>
-
-      <spinner left="10" height="20" follows="top|left" width="80" top_pad="5" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>
-
-      <text left_pad="20" height="15" name="import_dimensions" follows="top|left">
-        [X] x [Y] x [Z] m
-      </text>
-
-      <text left="10" top_pad="20" follows="top|left" height="15">
-        Include:
-      </text>
-
-      <check_box top_pad="5" name="upload_textures" height="15" follows="top|left" label="Textures"/>
-      <check_box top_pad="5" name="upload_skin" height="15" follows="top|left" label="Skin weight"/>
-      <check_box top_pad="5" left="20" name="upload_joints" height="15" follows="top|left" label="Joint positions"/>
-    </panel>
-
-
     <!-- LOD PANEL -->
     <panel
       border="true"
@@ -124,60 +110,110 @@
       <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="Good"/>
+      <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="Good"/>
+      <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="Good"/>
+      <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="Good"/>
-
-      <text left="10" width="240" height="15" top_pad="15" follows="left|top" name="lod_tabel_footer">
+      <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>
 
-      <text top_pad="10" height="15" follows="left|top">
+      <icon height="16" width="16" left="20" follows="left|top" name="lod_status_message_icon"/>
+      <text left_pad="5" width="200" height="15" follows="left|top" name="lod_status_message_text"/>
+        
+      <text top_pad="10" left="10" height="15" follows="left|top">
         Mesh
       </text>
 
-      <radio_group follows="top|left" height="100" left="30" name="lod_file_or_limit" width="240" value="lod_from_file">
-        <radio_item bottom="85" label="Load from file" name="lod_from_file"/>
-        <radio_item bottom="40" label="Auto generate" name="lod_auuto_generate"/>
+      <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="-60" width="140" left="45" value="" name="lod_file" height="20"/>
+      <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"/>
 
-      <text follows="top|left" top_pad="22" width="140" left="45" height="15">
-        Triangle Limit:
+      <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" left_pad="5" height="20" width="100" decimal_digits="0" enabled="true"/>
+      <spinner left_delta="0" bottom_delta="0"  follows="top|left" name="lod_error_threshold" min_val="0" max_val="100" height="20" width="100" decimal_digits="3" visible="false" enabled="true"/>
+
+      <text follows="top|left" name="build_operator_text" left="45" top_pad="10" width="100" height="15">
+        Build Operator:  
+      </text>
+      <text follows="top|left" name="queue_mode_text" left_pad="5" width="100" height="15">
+        Queue Mode:
+      </text>
+      <combo_box follows="top|left" name="build_operator" top_pad="5" left="45" width="100" height="20">
+        <combo_item name="half_edge_collapse">
+          Half Edge Collapse
+        </combo_item>
+        <combo_item name="edge_collapse">
+          Edge Collapse
+        </combo_item>
+      </combo_box>
+
+      <combo_box follows="top|left" name="queue_mode" left_pad="5" width="100" height="20">
+        <combo_item name="greedy">
+          Greedy
+        </combo_item>
+        <combo_item name="lazy">
+          Lazy
+        </combo_item>
+        <combo_item name="independent">
+          Independent
+        </combo_item>
+      </combo_box>
+
+      <text top_pad="10" name="border_mode_text" left="45" follows="left|top" width="100" height="15">
+        Border Mode:
       </text>
-      <spinner follows="top|left" name="lod_triangle_limit" top_pad="5" height="20" width="60" decimal_digits="0" enabled="true"/>
-
-      <button bottom_delta="3" left_pad="5" name="lod_generate" label="Generate" height="25" width="70" follows="left|top"/>
 
-      <text name="submeshes_info" follows="left|top" left="10" top_pad="7" height="15 width=240">
-        Layers: [SUBMESHES]
+      <text left_pad="5" name="share_tolderance_text"  follows="left|top" width="100" height="15">
+        Share Tolerance:
       </text>
-      <button left="30" follows="top|left" top_pad="5" name="clear_materials" label="Clear Materials" width="100" height="25"/>
-      <button left="30" follows="top|left" top_pad="5" name="consolidate" label="Consolidate" width="100" height="25"/>
 
-      <text left="10" top_pad="10" follows="top|left" width="240" height="15">
-        Normals
+      <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" height="20"/>
+             
+      <text left="10" top_pad="35" follows="top|left" width="240" height="15">
+        Generate Normals
       </text>
       <text left="35" top_pad="5" follows="top|left" width="100" height="15">
         Crease Angle:
       </text>
-      <spinner follows="top|left" top_pad="5" min_val="0" max_val="180" value="75" width="60" height="20" name="crease_angle"/>
-      <button follows="top|left" bottom_delta="3" left_pad="5" width="140" height="25" label="Generate Normals" name="generate_normals"/>
+      <spinner follows="top|left" left_pad="5" min_val="0" max_val="180" value="75" width="60" height="20" name="crease_angle"/>  
     </panel>
 
     <!--  PANEL -->
@@ -341,8 +377,32 @@
       </panel>
     </panel>
 
-   
-    
+    <!-- MODIFIERS PANEL -->
+    <panel
+      border="true"
+      label="Modifiers"
+      name="modifiers_panel">
+      <text left="10" width="90" bottom="30" follows="top|left" height="15">
+        Scale:
+      </text>
+      <text left_pad="5" width="140" follows="top|left" height="15">
+        Dimensions:
+      </text>
+
+      <spinner left="10" height="20" follows="top|left" width="80" top_pad="5" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>
+
+      <text left_pad="20" height="15" name="import_dimensions" follows="top|left">
+        [X] x [Y] x [Z] m
+      </text>
+
+      <text left="10" top_pad="20" follows="top|left" height="15">
+        Include:
+      </text>
+
+      <check_box top_pad="5" name="upload_textures" height="15" follows="top|left" label="Textures"/>
+      <check_box top_pad="5" name="upload_skin" height="15" follows="top|left" label="Skin weight"/>
+      <check_box top_pad="5" left="20" name="upload_joints" height="15" follows="top|left" label="Joint positions"/>
+    </panel>
   </tab_container>
   
   <!--
diff --git a/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml
new file mode 100644
index 0000000000..2650903f88
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="model_menu_gear_default"
+ visible="false">
+  <menu_item_check
+   label="Show edges"
+   layout="topleft"
+   name="show_edges">
+    <on_click
+       function="ModelImport.ViewOption.Action"
+       parameter="show_edges" />
+    <on_check
+       function="ModelImport.ViewOption.Check"
+       parameter="show_edges" />
+    <on_enable
+			 function="ModelImport.ViewOption.Enabled"
+			 parameter="show_edges" />
+  </menu_item_check>
+  <menu_item_check
+   label="Show physics"
+   layout="topleft"
+   name="show_physics">
+    <on_click
+       function="ModelImport.ViewOption.Action"
+       parameter="show_physics" />
+    <on_check
+       function="ModelImport.ViewOption.Check"
+       parameter="show_physics" />
+    <on_enable
+			 function="ModelImport.ViewOption.Enabled"
+			 parameter="show_physics" />
+  </menu_item_check>
+  <menu_item_check
+  label="Show textures"
+  layout="topleft"
+  name="show_textures">
+    <on_click
+       function="ModelImport.ViewOption.Action"
+       parameter="show_textures" />
+    <on_check
+       function="ModelImport.ViewOption.Check"
+       parameter="show_textures" />
+    <on_enable
+			 function="ModelImport.ViewOption.Enabled"
+			 parameter="show_textures" />
+  </menu_item_check>
+  <menu_item_check
+  label="Show skin weight"
+  layout="topleft"
+  name="show_skin_weight">
+    <on_click
+       function="ModelImport.ViewOption.Action"
+       parameter="show_skin_weight" />
+    <on_check
+       function="ModelImport.ViewOption.Check"
+       parameter="show_skin_weight" />
+    <on_enable
+			 function="ModelImport.ViewOption.Enabled"
+			 parameter="show_skin_weight" />
+  </menu_item_check>
+  <menu_item_check
+  label="Show joint positions"
+  layout="topleft"
+  name="show_joint_positions">
+    <on_click
+       function="ModelImport.ViewOption.Action"
+       parameter="show_joint_positions" />
+    <on_check
+       function="ModelImport.ViewOption.Check"
+       parameter="show_joint_positions" />
+    <on_enable
+			 function="ModelImport.ViewOption.Enabled"
+			 parameter="show_joint_positions" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 38833d14df..6c1e9a3082 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3153,17 +3153,7 @@
             <menu_item_call.on_click
              function="Advanced.LeaveAdminStatus" />
         </menu_item_call>
-		<menu_item_call
-           label="HACK Upload Model..."
-           layout="topleft"
-           name="Upload Model">
-          <menu_item_call.on_click
-             function="File.UploadModel"
-             parameter="" />
-          <menu_item_call.on_enable
-             function="File.EnableUploadModel" />
-        </menu_item_call>
-        <menu_item_check
+		    <menu_item_check
          label="Show Admin Menu"
          name="View Admin Options">
             <menu_item_check.on_enable