Merge branch 'master' into DRTVWR-507-maint

# Conflicts:
#	indra/newview/llfloatermodelpreview.cpp

4 files changed, 447 insertions, 148 deletions

diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Flashing.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Flashing.png
new file mode 100644
index 0000000000..fd13bb699d
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Right_Flashing.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 7325d836d2..a875c4e848 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -634,6 +634,7 @@ with the same filename but different name
 
   <texture name="TabTop_Right_Off" file_name="containers/TabTop_Right_Off.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
   <texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
+  <texture name="TabTop_Right_Flashing" file_name="containers/TabTop_Right_Flashing.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
   <texture name="TabTop_Middle_Off" file_name="containers/TabTop_Middle_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
   <texture name="TabTop_Middle_Selected" file_name="containers/TabTop_Middle_Selected.png" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
   <texture name="TabTop_Left_Off" file_name="containers/TabTop_Left_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
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 5a86eb06fb..02a21764ce 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -2,15 +2,16 @@
 <floater
  can_close="true"
  can_drag_on_left="false"
- can_minimize="false"
- can_resize="false"
- height="480"
- min_height="480"
+ can_minimize="true"
+ can_resize="true"
+ height="625"
+ min_height="625"
  width="980"
  min_width="980"
  name="Model Preview"
  title="UPLOAD MODEL"
- help_topic="upload_model" >
+ help_topic="upload_model"
+ legacy_header_height="25">
 
   <string name="status_idle"></string>
   <string name="status_parse_error">Error: Dae parsing issue - see log for details.</string>
@@ -33,19 +34,27 @@
   <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="phys_status_vertex_limit_exceeded">Some physical hulls exceed vertex limitations.</string>
+  <string name="phys_status_degenerate_triangles">The physics mesh too dense remove the small thin triangles (see preview)</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>
   <string name="tbd">TBD</string>
+  
+  <!-- Warnings and info from model loader-->
+  <string name="TooManyJoint">Skinning disabled due to too many joints: [JOINTS], maximum: [MAX]</string>
+  <string name="UnrecognizedJoint">Rigged to unrecognized joint name [NAME]</string>
+  <string name="UnknownJoints">Skinning disabled due to [COUNT] unknown joints</string>
+  <string name="ModelLoaded">Model [MODEL_NAME] loaded</string>
+  <string name="IncompleteTC">Texture coordinates data is not complete.</string>
 
-<panel
-  follows="top|left"
-  height="455"
-  layout="topleft"
-  left="3"
-  name="left_panel"
-  top_pad="10"
-  width="630">
+  <panel
+    follows="top|left"
+    height="595"
+    layout="topleft"
+    left="3"
+    name="left_panel"
+    top_pad="25"
+    width="635">
     <panel
       follows="all"
       height="50"
@@ -76,12 +85,16 @@
     </panel>
     <tab_container
       follows="top|left"
-      top_pad="15"
+      top_pad="10"
       left="0"
-      height="300"
+      height="330"
       width="635"
       name="import_tab"
-      tab_position="top">
+      tab_position="top"
+      enable_tabs_flashing="true"
+      tabs_flashing_color="MenuItemFlashBgColor">
+      <last_tab
+        tab_top_image_flash="TabTop_Right_Flashing"/> <!-- for log tab -->
       <!-- LOD PANEL -->
         <panel
          help_topic="upload_model_lod"
@@ -92,12 +105,12 @@
             <view_border
              bevel_style="none"
              follows="top|left"
-             height="275"
+             height="306"
              layout="topleft"
              left="3"
              name="lod_tab_border"
              top_pad="0"
-             width="629" />
+             width="628" />
           <text
            follows="left|top"
            height="18"
@@ -688,7 +701,7 @@
              left="10"
              name="lod_tab_border"
              top_pad="20"
-             width="605" />
+             width="614" />
             <check_box
              follows="top|left"
              height="15"
@@ -730,12 +743,12 @@
             <view_border
               bevel_style="none"
               follows="top|left"
-              height="275"
+              height="306"
               layout="topleft"
               left="3"
               name="physics_tab_border"
               top_pad="0"
-              width="619"/>
+              width="628"/>
                 <panel
                   bg_alpha_color="0 0 0 0"
                   bg_opaque_color="0 0 0 0.3"
@@ -755,8 +768,9 @@
                       name="first_step_name"
                       text_color="White"
                       top_pad="0"
-                      width="210">
-                      Step 1: Level of Detail
+                      width="210"
+                      valign="center">
+                      Step 1: Pick a physics model :
                     </text>
                     <combo_box
                       follows="left|top"
@@ -798,7 +812,7 @@
               layout="topleft"
               left="18"
               name="physics_tab_border"
-              top_pad="15"
+              top_pad="10"
               width="589"/>
                 <panel
                   bg_alpha_color="0 0 0 0"
@@ -807,7 +821,7 @@
                   follows="top|left"
                   left="18"
                   name="physics analysis"
-                  top_pad="15"
+                  top_pad="10"
                   visible="true"
                   width="589">
                     <text
@@ -819,7 +833,7 @@
                       name="method_label"
                       text_color="White"
                       top_pad="0">
-                      Step 2: Analyze
+                      Step 2: Convert to hulls (optional)
                     </text>
                     <text
                       follows="top|left"
@@ -905,7 +919,7 @@
               layout="topleft"
               left="18"
               name="physics_tab_border"
-              top_pad="15"
+              top_pad="10"
               width="589"/>
                 <panel
                   bg_alpha_color="0 0 0 0"
@@ -914,7 +928,7 @@
                   height="66"
                   left="18"
                   name="physics simplification"
-                  top_pad="15"
+                  top_pad="10"
                   width="589">
                     <text
                       text_color="White"
@@ -1013,7 +1027,7 @@
               layout="topleft"
               left="18"
               name="physics_tab_border"
-              top_pad="15"
+              top_pad="10"
               width="589"/>
                 <panel
                   bg_alpha_color="0 0 0 0"
@@ -1075,10 +1089,9 @@
                  follows="left|top"
                  height="19"
                  layout="topleft"
-                 left_pad="5"
-                 top_delta="0"
+                 top_pad="5"
                  name="physics message"
-                 width="270">
+                 width="589">
                      <icon
                       follows="left|top"
                       height="16"
@@ -1093,7 +1106,7 @@
                       layout="topleft"
                       left_pad="2"
                       name="physics_status_message_text"
-                      width="252"
+                      width="573"
                       top_delta="3"/>
                 </panel>
         </panel>
@@ -1105,12 +1118,12 @@
          <view_border
           bevel_style="none"  
           follows="top|left"
-          height="275"
+          height="306"
           layout="topleft"
           left="3"
           name="border"
           top_pad="0"
-          width="619"/>
+          width="628"/>
            <text
              follows="top|left"
              height="16"
@@ -1157,75 +1170,211 @@
              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="20"
-             name="include_label"
-             text_color="White"
-             top_pad="20"
-             width="150">
-             For avatar models only:
-           </text>
-           <check_box
-             follows="top|left"
-             height="15"
-             label="Include skin weight"
-             label_text.text_color="White"
-             name="upload_skin"
-             top_pad="15"/>
-           <check_box
-             follows="top|left"
-             height="15"
-             label="Include joint positions"
-             label_text.text_color="White"
-             name="upload_joints"
-             top_pad="15"/>
-           <check_box
-             follows="top|left"
-             height="15"
-             label="Lock scale if joint position defined"
-             label_text.text_color="White"
-             name="lock_scale_if_joint_position"
-             top_pad="15"/>
-           <text
-             follows="top|left"
-             height="15"
-             layout="topleft"
-             left="220"
-             name="pelvis_offset_label"
-             text_color="White"
-             top="134"
-             width="200">
-             Z offset (raise or lower avatar):
-           </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>
+      <panel
+       label="Overrides"
+       layout="topleft"
+       name="rigging_panel"
+       title="Rigging">
+        <view_border
+         bevel_style="none"
+         follows="top|left"
+         height="306"
+         layout="topleft"
+         left="3"
+         name="avatar_tab_border"
+         top_pad="0"
+         width="628" />
+        <check_box
+          follows="top|left"
+          height="15"
+          label="Include skin weight"
+          label_text.text_color="White"
+          name="upload_skin"
+          top="8"
+          left="20"/>
+        <check_box
+          follows="top|left"
+          height="15"
+          label="Include joint positions"
+          label_text.text_color="White"
+          name="upload_joints"
+          left_delta="0"
+          top_pad="7"/>
+        <check_box
+          follows="top|left"
+          height="15"
+          label="Lock scale if joint position defined"
+          label_text.text_color="White"
+          name="lock_scale_if_joint_position"
+          top_pad="7"/>
+        <text
+          follows="top|left"
+          height="15"
+          layout="topleft"
+          left="220"
+          name="pelvis_offset_label"
+          text_color="White"
+          top="8"
+          width="200">
+          Z offset (raise or lower avatar):
+        </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"/>
+        <text
+          follows="top|left"
+          height="17"
+          left="425"
+          name="skin_too_many_joints"
+          text_color="Orange"
+          top="7"
+          width="195"
+          word_wrap="true">
+          Too many skinned joints
+        </text>
+        <text
+          follows="top|left"
+          height="32"
+          left="425"
+          name="skin_unknown_joint"
+          text_color="Orange"
+          top="8"
+          width="195"
+          word_wrap="true">
+          Model has an unknown joint(s)
+        </text>
+        <text
+          layout="topleft"
+          follows="top|left"
+          height="15"
+          left="20"
+          name="joints_descr"
+          top="73"
+          width="150">
+          Joints:
+        </text>
+        <scroll_list
+         layout="topleft"
+         follows="top|left"
+         name="joints_list"
+         column_padding="0"
+         draw_heading="false"
+         draw_stripes="false"
+         commit_on_selection_change="true"
+         heading_height="23"
+         height="199"
+         left_delta="0"
+         top_pad="0"
+         width="200"/>
+        <text
+          layout="topleft"
+          follows="top|left"
+          height="15"
+          left_delta="0"
+          name="conflicts_description"
+          top_pad="2"
+          width="200">
+          [CONFLICTS] conflicts in [JOINTS_COUNT] joints
+        </text>
+        <text
+          layout="topleft"
+          follows="top|left"
+          height="15"
+          left_pad="5"
+          name="pos_overrides_descr"
+          top="73"
+          width="300">
+          Position overrides for joint '[JOINT]':
+        </text>
+        <scroll_list
+         layout="topleft"
+         follows="top|left"
+         name="pos_overrides_list"
+         column_padding="0"
+         draw_heading="true"
+         draw_stripes="false"
+         heading_height="23"
+         height="100"
+         left_delta="0"
+         top_pad="0"
+         width="385">
+          <scroll_list.columns
+           label="Model"
+           name="model_name"
+           relative_width="0.49" />
+          <scroll_list.columns
+           label="X"
+           name="axis_x"
+           relative_width="0.17" />
+          <scroll_list.columns
+           label="Y"
+           name="axis_y"
+           relative_width="0.17" />
+          <scroll_list.columns
+           label="Z"
+           name="axis_z"
+           relative_width="0.17" />
+        </scroll_list>
+      </panel>
+      <panel
+       label="Log"
+       layout="topleft"
+       name="logs_panel"
+       title="Log">
+        <view_border
+         bevel_style="none"
+         follows="top|left"
+         height="289"
+         layout="topleft"
+         left="3"
+         name="log_tab_border"
+         top_pad="0"
+         width="628" />
+        <text_editor
+         type="string"
+         length="1"
+         embedded_items="false"
+         follows="top|left"
+         font="SansSerif"
+         ignore_tab="false"
+         layout="topleft"
+         height="289"
+         left="4"
+         top="0"
+         right="-1"
+         max_length="65536"
+         name="log_text"
+         parse_urls="true"
+         spellcheck="false"
+         read_only="true"
+         word_wrap="true">
+        </text_editor>
+        <check_box
+         control_name="ImporterDebug"
+         follows="top|left"
+         top_pad="9"
+         left="6"
+         width="70"
+         label="Enable detailed logging"
+         name="verbose_logging"/>
+      </panel>
     </tab_container>
     <panel
-     follows="top|left"
-     height="80"
-     layout="top|left"
-     left="0"
+     follows="top|left|bottom"
+     layout="topleft"
+     height="195"
+     left="4"
+     border="true"
      name="weights_and_warning_panel"
      top_pad="3"
-     width="625">
+     width="629">
        <button
          follows="top|left"
          label="Calculate weights &amp; fee"
@@ -1265,10 +1414,10 @@
          label_color="White"
          layout="topleft"
          name="reset_btn"
-         right="-2"
+         right="-5"
          top="3"
          height="20"
-         width="275"/>
+         width="265"/>
        <!-- ========== WEIGHTS ==========-->
        <text
          follows="top|left"
@@ -1287,7 +1436,7 @@
          left_pad="0"
          name="prim_weight"
          top_delta="0"
-         width="120"
+         width="130"
          word_wrap="true">
          Land impact: [EQ]
        </text>
@@ -1297,7 +1446,7 @@
          left_pad="0"
          name="download_weight"
          top_delta="0"
-         width="100"
+         width="130"
          word_wrap="true">
          Download: [ST]
        </text>
@@ -1307,7 +1456,7 @@
          layout="topleft"
          left_pad="0"
          name="physics_weight"
-         width="90"
+         width="130"
          word_wrap="true">
          Physics: [PH]
        </text>
@@ -1317,19 +1466,150 @@
          layout="topleft"
          left_pad="0"
          name="server_weight"
-         width="83"
+         width="130"
          word_wrap="true">
          Server: [SIM]
        </text>
-       <!-- ========== NOTE MESSAGE ========== -->
+       <!-- =========== Cost breakdown ======== -->
+      <panel
+        border="true"
+        top_pad="5"
+        layout="topleft"
+        left="6"
+        name="price_breakdown_panel"
+        width="120"
+        height="100">
+        <text
+          layout="topleft"
+          left="3">
+          Price Breakdown
+        </text>
+        <view_border
+          bevel_style="none"
+          follows="top|left"
+          height="0"
+          layout="topleft"
+          left="3"
+          name="price_breakdown_border"
+          top_pad="5"
+          width="110"/>
+        <text
+          height="80"
+          top_pad="5"
+          layout="topleft"
+          left="3"
+          name="price_breakdown_labels"
+          width="70"
+          word_wrap="false">
+Download:
+Physics:
+Instances:
+Textures:
+Model:
+        </text>
+        <text
+          height="80"
+          top_delta="0"
+          layout="topleft"
+          halign="right"
+          left_pad="0"
+          name="price_breakdown"
+          width="40"
+          word_wrap="false">
+[STREAMING]
+[PHYSICS]
+[INSTANCES]
+[TEXTURES]
+[MODEL]
+        </text>
+      </panel>
+       <!-- 
+       Streaming breakdown numbers are available but not fully understood
+       uncommenting the following sections will display the numbers for debugging purposes
+       <text
+        height="80"
+        top_delta="0"
+        layout="topleft"
+        left="130"
+        name="streaming_breakdown_labels"
+        width="65"
+        word_wrap="true">
+Streaming/Download:
+High:
+Medium:
+Low:
+Lowest:
+      </text>
        <text
+        height="80"
+        top_delta="0"
+        layout="topleft"
+        left_pad="0"
+        name="streaming_breakdown"
+        width="95"
+        word_wrap="true">
+[STR_TOTAL]
+[STR_HIGH]
+[STR_MED]
+[STR_LOW]
+[STR_LOWEST]
+      </text>-->
+      <panel
+        border="true"
+        layout="topleft"
+        left_pad="265"
+        name="physics_costs_panel"
+        width="120"
+        height="100">
+        <text
+          layout="topleft"
+          left="3">
+          Physics Costs
+        </text>
+        <view_border
+          bevel_style="none"
+          follows="top|left"
+          height="0"
+          layout="topleft"
+          left="3"
+          name="price_breakdown_border"
+          top_pad="5"
+          width="110"/>
+        <text
+         height="80"
+         top_pad="5"
+         layout="topleft"
+         left="5"
+         name="physics_breakdown_labels"
+         width="65">
+Base Hull:
+Mesh:
+Analysed:
+        </text>
+        <text
+         height="80"
+         top_delta="0"
+         layout="topleft"
+         left_pad="0"
+         name="physics_breakdown"
+         width="40"
+         halign="right"
+         word_wrap="false"
+         visible="true">
+[PCH]
+[PM]
+[PHU]
+        </text>-->
+      </panel>
+      <!-- ========== NOTE MESSAGE ========== -->
+      <text
          font="SansSerif"
          layout="topleft"
          left="6"
          name="warning_title"
-         top_pad="10"
+         top_pad="5"
          text_color="DrYellow"
-         visible="false"
+         visible="true"
          width="40">
          NOTE:
        </text>
@@ -1340,44 +1620,51 @@
          left_pad="1"
          name="warning_message"
          parse_urls="true"
-         top_delta="2"
+         top_delta="1"
          wrap="true"
          width="462"
-         visible="false">
+         visible="true">
          You dont have rights to upload mesh models. [[VURL] Find out how] to get certified.
+       </text> 
+       <text
+         text_color="Yellow"
+         layout="topleft"
+         top_pad="-2"
+         left="6"
+         name="status">
+[STATUS]
        </text>
-       <text text_color="Yellow" layout="topleft" top_delta="20" left="6" name="status">[STATUS]</text>
-  
     </panel>
-</panel>
-
-<text 
- follows="left|top"
- layout="topleft"
- left="640"
- name="lod_label"
- text_color="White"
- top="13"
- height="15"
- width="290">
- Preview:
- </text>
-<panel
- border="true"
- bevel_style="none"
- follows="top|left"
- name="preview_panel"
- top_pad="4"
- width="290"
- height="290"/>
-
-<panel
-  follows="all"
-  height="130"
-  layout="topleft"
-  name="right_panel"
-  top_pad="5"
-  width="340">
+  </panel>
+  
+  <text
+   follows="left|top"
+   layout="topleft"
+   left="640"
+   name="lod_label"
+   text_color="White"
+   top="29"
+   height="15"
+   width="290">
+    Preview:
+  </text>
+  <panel
+   follows="all"
+   layout="topleft"
+   border="true"
+   bevel_style="none"
+   name="preview_panel"
+   top_pad="4"
+   width="325"
+   height="408"/>
+  <panel
+    follows="right|bottom"
+    can_resize="false"
+    height="140"
+    layout="topleft"
+    name="right_panel"
+    top_pad="5"
+    width="340">
     <combo_box
       top_pad="3"
       follows="left|top"
@@ -1386,10 +1673,10 @@
       name="preview_lod_combo"
       width="150"
       tool_tip="LOD to view in preview render">
-        <combo_item name="high">   High   </combo_item>
-        <combo_item name="medium"> Medium </combo_item>
-        <combo_item name="low">    Low    </combo_item>
-        <combo_item name="lowest"> Lowest </combo_item>
+      <combo_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"
@@ -1436,11 +1723,21 @@
     </check_box>
     <check_box
       follows="top|left"
+      label="Joint position overrides"
+      label_text.text_color="White"
+      word_wrap="down"
+      width="130"
+      layout="topleft"
+      name="show_joint_overrides"
+      top_pad="8">
+    </check_box>
+    <check_box
+      follows="top|left"
       label="Joints"
       label_text.text_color="White"
       layout="topleft"
       name="show_joint_positions"
-      top_pad="8">
+      top_pad="17">
     </check_box>
     <text
       follows="top|left"
@@ -1460,5 +1757,5 @@
       max_val="3.0"
       height="20"
       width="150"/>
-</panel>
+  </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug.xml b/indra/newview/skins/default/xui/en/floater_script_debug.xml
index cd88048d6b..6c49cfa1a8 100644
--- a/indra/newview/skins/default/xui/en/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_debug.xml
@@ -17,5 +17,6 @@
      name="Preview Tabs"
      tab_position="bottom"
      top="16"
-     width="448" />
+     width="448"
+     enable_tabs_flashing="true"/>
 </multi_floater>