From 3b932c27b7b1009ef404da5a7e0613d9cd3e7bf5 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Thu, 3 Jan 2019 00:35:38 +0200
Subject: SL-10288 Mesh uploader changes from Firestorm

---
 .../skins/default/xui/en/floater_model_preview.xml | 369 ++++++++++++++-------
 1 file changed, 255 insertions(+), 114 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 3db431de1b..ec9104d5e7 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -2,12 +2,12 @@
 <floater
  can_close="true"
  can_drag_on_left="false"
- can_minimize="false"
- can_resize="false"
- height="480"
- min_height="480"
- width="980"
- min_width="980"
+ can_minimize="true"
+ can_resize="true"
+ height="600"
+ min_height="600"
+ width="1024"
+ min_width="1024"
  name="Model Preview"
  title="UPLOAD MODEL"
  help_topic="upload_model" >
@@ -33,19 +33,21 @@
   <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="phys_status_no_havok">The Firestorm OpenSim build is not supported for physics upload in SL.</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>
 
-<panel
-  follows="top|left"
-  height="455"
-  layout="topleft"
-  left="3"
-  name="left_panel"
-  top_pad="10"
-  width="630">
+  <panel
+    follows="top|left"
+    height="580"
+    layout="topleft"
+    left="3"
+    name="left_panel"
+    top_pad="0"
+    width="630">
     <panel
       follows="all"
       height="50"
@@ -784,8 +786,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"
@@ -827,7 +830,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"
@@ -836,7 +839,7 @@
                   follows="top|left"
                   left="18"
                   name="physics analysis"
-                  top_pad="15"
+                  top_pad="10"
                   visible="true"
                   width="589">
                     <text
@@ -848,7 +851,7 @@
                       name="method_label"
                       text_color="White"
                       top_pad="0">
-                      Step 2: Analyze
+                      Step 2: Convert to hulls (optional)
                     </text>
                     <text
                       follows="top|left"
@@ -934,7 +937,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"
@@ -943,7 +946,7 @@
                   height="66"
                   left="18"
                   name="physics simplification"
-                  top_pad="15"
+                  top_pad="10"
                   width="589">
                     <text
                       text_color="White"
@@ -1042,7 +1045,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"
@@ -1104,10 +1107,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"
@@ -1122,7 +1124,7 @@
                       layout="topleft"
                       left_pad="2"
                       name="physics_status_message_text"
-                      width="252"
+                      width="573"
                       top_delta="3"/>
                 </panel>
         </panel>
@@ -1248,13 +1250,14 @@
      </panel>
     </tab_container>
     <panel
-     follows="top|left"
-     height="80"
-     layout="top|left"
-     left="0"
+     follows="top|left|bottom"
+     layout="topleft"
+     height="184"
+     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"
@@ -1294,10 +1297,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"
@@ -1316,7 +1319,7 @@
          left_pad="0"
          name="prim_weight"
          top_delta="0"
-         width="120"
+         width="130"
          word_wrap="true">
          Land impact: [EQ]
        </text>
@@ -1326,7 +1329,7 @@
          left_pad="0"
          name="download_weight"
          top_delta="0"
-         width="100"
+         width="130"
          word_wrap="true">
          Download: [ST]
        </text>
@@ -1336,7 +1339,7 @@
          layout="topleft"
          left_pad="0"
          name="physics_weight"
-         width="90"
+         width="130"
          word_wrap="true">
          Physics: [PH]
        </text>
@@ -1346,17 +1349,148 @@
          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="price_breakdown_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"
          width="40">
@@ -1375,104 +1509,110 @@
          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>
-  
+       <text text_color="Yellow" layout="topleft" top_delta="5" 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">
-    <combo_box
-      top_pad="3"
+  </panel>
+  <panel
+    follows="top|left|bottom|right"
+    can_resize="true"
+    name="right_panel"
+    top="0"
+    left="640"
+    background_visible="true"
+    width="375">
+    <text
       follows="left|top"
-      height="18"
       layout="topleft"
-      name="preview_lod_combo"
-      width="150"
-      tool_tip="LOD to view in preview render">
+      left="0"
+      name="lod_label"
+      text_color="White"
+      top="13"
+      height="15"
+      width="290">
+      Preview:
+    </text>
+    <panel
+      can_resize="false"
+      follows="top|left"
+      height="20"
+      name="right_upper_panel"
+      top="8"
+      left="60"
+      background_visible="true"
+      width="315">
+      <combo_box
+        top_pad="3"
+        can_resize="false"
+        follows="top|left"
+        height="18"
+        layout="topleft"
+        name="preview_lod_combo"
+        width="75"
+        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_box>
-    <text
-      follows="top|left"
-      layout="topleft"
-      text_color="White"
-      top="5"
-      left_pad="20"
-      name="label_display"
-      width="50">
-      Display...
-    </text>
-    <check_box
-      follows="top|left"
-      label="Edges"
+      </combo_box>
+    </panel>
+  </panel>
+  <panel
+     border="true"
+     bevel_style="none"
+     follows="top|left|right|bottom"
+     layout="topleft"
+     name="preview_panel"
+     top="30"
+     width="375"
+     height="525"/>
+
+   <panel
+     follows="left|right|bottom"
+     layout="topleft"
+     height="40"
+     name="lower_right_panel"
+     top_pad="5"
+     width="375">
+     <check_box
+       follows="right|bottom"
+       label="Edges"
       label_text.text_color="White"
       layout="topleft"
-      left_delta="0"
       name="show_edges"
-      top_pad="8">
-    </check_box>
+      width="70"
+      left="0"
+      top_pad="8"/>
     <check_box
-      follows="top|left"
+      follows="right|bottom"
+      left_pad="8"
       label="Physics"
       label_text.text_color="White"
-      layout="topleft"
-      name="show_physics"
-      top_pad="8">
-    </check_box>
+      name="show_physics"/>
     <check_box
-      follows="top|left"
+      follows="right|bottom"
       label="Textures"
       label_text.text_color="White"
       layout="topleft"
       name="show_textures"
-      top_pad="8">
-    </check_box>
+      left_pad="0"/>
     <check_box
-      follows="top|left"
-      label="Skin weights"
+      follows="right|bottom"
+      label="Weights"
       label_text.text_color="White"
       layout="topleft"
       name="show_skin_weight"
-      top_pad="8">
-    </check_box>
+      left_pad="0"/>
     <check_box
-      follows="top|left"
+      follows="right|bottom"
       label="Joints"
       label_text.text_color="White"
       layout="topleft"
       name="show_joint_positions"
-      top_pad="8">
-    </check_box>
+      left_pad="0"/>
     <text
-      follows="top|left"
+      follows="right|bottom"
       layout="topleft"
       left="2"
       name="physics_explode_label"
@@ -1482,12 +1622,13 @@
     </text>
     <slider
       name="physics_explode"
-      follows="top|left"
-      top="100"
-      left="0"
+      follows="right|bottom"
+      valign="center"
+      top="15"
+      left="80"
       min_val="0.0"
       max_val="3.0"
       height="20"
-      width="150"/>
-</panel>
+      width="120"/>
+  </panel>
 </floater>
-- 
cgit v1.2.3


From e906af7c3c6e4efd84b344c9572167f6ddf836fc Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 11 Jan 2019 17:39:26 +0200
Subject: SL-10327 FIXED Scalable preview of mesh model is shown with black bar
 on top in the Upload Model menu

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 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 ec9104d5e7..1b038a0244 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1520,7 +1520,6 @@ Analysed:
     name="right_panel"
     top="0"
     left="640"
-    background_visible="true"
     width="375">
     <text
       follows="left|top"
@@ -1540,7 +1539,6 @@ Analysed:
       name="right_upper_panel"
       top="8"
       left="60"
-      background_visible="true"
       width="315">
       <combo_box
         top_pad="3"
@@ -1616,7 +1614,7 @@ Analysed:
       layout="topleft"
       left="2"
       name="physics_explode_label"
-      top="85"
+      bottom_pad="2"
       width="150">
       Preview Spread:
     </text>
@@ -1624,8 +1622,8 @@ Analysed:
       name="physics_explode"
       follows="right|bottom"
       valign="center"
-      top="15"
-      left="80"
+      left="105"
+      top_delta="-3"
       min_val="0.0"
       max_val="3.0"
       height="20"
-- 
cgit v1.2.3


From 3cb20abfc928868fb6e95eaa78ea05b494d08af3 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 10 Jan 2019 15:41:48 +0200
Subject: SL-10329 Increase panel height to avoid message overlapping

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 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 1b038a0244..ceea5b7421 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -34,7 +34,6 @@
   <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="phys_status_no_havok">The Firestorm OpenSim build is not supported for physics upload in SL.</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>
@@ -1252,7 +1251,7 @@
     <panel
      follows="top|left|bottom"
      layout="topleft"
-     height="184"
+     height="197"
      left="4"
      border="true"
      name="weights_and_warning_panel"
@@ -1441,7 +1440,7 @@ Lowest:
         border="true"
         layout="topleft"
         left_pad="265"
-        name="price_breakdown_panel"
+        name="physics_costs_panel"
         width="120"
         height="100">
         <text
@@ -1509,7 +1508,7 @@ Analysed:
          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="5" left="6" name="status">
+       <text text_color="Yellow" layout="topleft" top_pad="-1" left="6" name="status">
 [STATUS]
        </text>
     </panel>
-- 
cgit v1.2.3


From 5614f6cbf6867b0114a45aadbe1d975a3d71000c Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 29 Nov 2018 21:04:35 +0200
Subject: SL-9747 [Mesh Uploader] Remove confusing model_metric from upload

---
 .../skins/default/xui/en/floater_model_preview.xml | 29 ----------------------
 1 file changed, 29 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 ceea5b7421..274e6e6c7a 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -74,35 +74,6 @@
           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">
-          This model represents...
-        </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="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"/>
-         </combo_box>
     </panel>
     <tab_container
       follows="top|left"
-- 
cgit v1.2.3


From 580b35c8ea59187d5197e712022b706df3655f86 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 1 Apr 2019 20:22:25 +0300
Subject: SL-307 Display in-viewer all warning messages logged by the mesh
 uploader

---
 .../skins/default/xui/en/floater_model_preview.xml | 39 ++++++++++++++++++++--
 1 file changed, 37 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 274e6e6c7a..cbc5aeb37d 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -82,7 +82,8 @@
       height="300"
       width="635"
       name="import_tab"
-      tab_position="top">
+      tab_position="top"
+      enable_tabs_flashing="true">
       <!-- LOD PANEL -->
         <panel
          help_topic="upload_model_lod"
@@ -98,7 +99,7 @@
              left="3"
              name="lod_tab_border"
              top_pad="0"
-             width="629" />
+             width="619" />
           <text
            follows="left|top"
            height="18"
@@ -1218,6 +1219,40 @@
              value="0.0"
              width="80"/>
      </panel>
+      <panel
+       label="Log"
+       layout="topleft"
+       name="logs_panel"
+       title="Log">
+        <view_border
+         bevel_style="none"
+         follows="top|left"
+         height="275"
+         layout="topleft"
+         left="3"
+         name="log_tab_border"
+         top_pad="0"
+         width="619" />
+        <text_editor
+         type="string"
+         length="1"
+         embedded_items="false"
+         follows="top|left"
+         font="SansSerif"
+         ignore_tab="false"
+         layout="topleft"
+         height="275"
+         left="4"
+         top="0"
+         right="-11"
+         max_length="65536"
+         name="log_text"
+         parse_urls="true"
+         spellcheck="false"
+         read_only="true"
+         word_wrap="true">
+        </text_editor>
+      </panel>
     </tab_container>
     <panel
      follows="top|left|bottom"
-- 
cgit v1.2.3


From 1840868178cbf3577ffa9757f093207f3bb10fd7 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 27 Nov 2019 20:34:26 +0200
Subject: SL-304 [Mesh Uploader] Localization support for logs, better warnings
 for joints

---
 .../skins/default/xui/en/floater_model_preview.xml | 31 ++++++++++++++++++++--
 1 file changed, 29 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 cbc5aeb37d..7e92e0360e 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -38,6 +38,12 @@
   <string name="decomposing">Analyzing...</string>
   <string name="simplifying">Simplifying...</string>
   <string name="tbd">TBD</string>
+  
+  <!-- Warnings 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>
+  
 
   <panel
     follows="top|left"
@@ -1184,20 +1190,41 @@
              label_text.text_color="White"
              name="upload_skin"
              top_pad="15"/>
+           <text
+             follows="top|left"
+             height="17"
+             left="40"
+             name="skin_too_many_joints"
+             text_color="Orange"
+             top_pad="-2"
+             width="150">
+             Too many skinned joints
+           </text>
+           <text
+             follows="top|left"
+             height="17"
+             left="40"
+             name="skin_unknown_joint"
+             text_color="Orange"
+             top_pad="-17"
+             width="150">
+             Model has an unknown joint(s)
+           </text>
            <check_box
              follows="top|left"
              height="15"
              label="Include joint positions"
              label_text.text_color="White"
              name="upload_joints"
-             top_pad="15"/>
+             left_delta="-20"
+             top_pad="1"/>
            <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"/>
+             top_pad="16"/>
            <text
              follows="top|left"
              height="15"
-- 
cgit v1.2.3


From 5c7b0dfe84f745bc5f6ccc0630ed1beb0ad87d00 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 28 Nov 2019 20:23:22 +0200
Subject: SL-304 [Mesh Uploader] A bit of cleanup (parse warnings, missing
 items, cleanup log)

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 4 ----
 1 file changed, 4 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 7e92e0360e..f5be4bab10 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1548,7 +1548,6 @@ Analysed:
   </panel>
   <panel
     follows="top|left|bottom|right"
-    can_resize="true"
     name="right_panel"
     top="0"
     left="640"
@@ -1565,7 +1564,6 @@ Analysed:
       Preview:
     </text>
     <panel
-      can_resize="false"
       follows="top|left"
       height="20"
       name="right_upper_panel"
@@ -1574,7 +1572,6 @@ Analysed:
       width="315">
       <combo_box
         top_pad="3"
-        can_resize="false"
         follows="top|left"
         height="18"
         layout="topleft"
@@ -1646,7 +1643,6 @@ Analysed:
       layout="topleft"
       left="2"
       name="physics_explode_label"
-      bottom_pad="2"
       width="150">
       Preview Spread:
     </text>
-- 
cgit v1.2.3


From c5859778bc18ef8114b57b616675de15a8e177cb Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 17 Jan 2020 21:08:38 +0200
Subject: SL-379 WIP Joint overrides tab

---
 .../skins/default/xui/en/floater_model_preview.xml | 116 +++++++++++++++++++++
 1 file changed, 116 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 f5be4bab10..b675a3e3be 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1246,6 +1246,122 @@
              value="0.0"
              width="80"/>
      </panel>
+      <panel
+       label="Overrides"
+       layout="topleft"
+       name="overrides_panel"
+       title="Overrides">
+        <view_border
+         bevel_style="none"
+         follows="top|left"
+         height="275"
+         layout="topleft"
+         left="3"
+         name="log_tab_border"
+         top_pad="0"
+         width="619" />
+        <text
+          layout="topleft"
+          follows="top|left"
+          height="15"
+          left="6"
+          name="joints_descr"
+          top="4"
+          width="300">
+          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="253"
+         left="6"
+         top_pad="0"
+         width="150"/>
+        <text
+          layout="topleft"
+          follows="top|left"
+          height="15"
+          left_pad="5"
+          name="pos_overrides_descr"
+          top="4"
+          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="310">
+          <scroll_list.columns
+           label="*"
+           name="override"
+           relative_width="0.22"  />
+          <scroll_list.columns
+           label="X"
+           name="axis_x"
+           relative_width="0.26"  />
+          <scroll_list.columns
+           label="Y"
+           name="axis_y"
+           relative_width="0.26"  />
+          <scroll_list.columns
+           label="Z"
+           name="axis_z"
+           relative_width="0.26"  />
+        </scroll_list>
+        <text
+          layout="topleft"
+          follows="top|left"
+          height="15"
+          left_delta="0"
+          name="scale_overrides_descr"
+          top_pad="3"
+          width="300">
+          Scale overrides for joint '[JOINT]':
+        </text>
+        <scroll_list
+         layout="topleft"
+         follows="top|left"
+         name="scale_overrides_list"
+         column_padding="0"
+         draw_heading="true"
+         draw_stripes="false"
+         heading_height="23"
+         height="100"
+         left_delta="0"
+         top_pad="0"
+         width="310">
+          <scroll_list.columns
+           label="*"
+           name="override"
+           relative_width="0.22"  />
+          <scroll_list.columns
+           label="X"
+           name="axis_x"
+           relative_width="0.26"  />
+          <scroll_list.columns
+           label="Y"
+           name="axis_y"
+           relative_width="0.26"  />
+          <scroll_list.columns
+           label="Z"
+           name="axis_z"
+           relative_width="0.26"  />
+        </scroll_list>
+      </panel>
       <panel
        label="Log"
        layout="topleft"
-- 
cgit v1.2.3


From 5fddc374566a0111375df2191b9c38cd8752881e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 5 Feb 2020 21:06:35 +0200
Subject: SL-12673 Make mesh uploader fit into 980px

---
 .../skins/default/xui/en/floater_model_preview.xml | 148 ++++++++++-----------
 1 file changed, 74 insertions(+), 74 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 b675a3e3be..bd8b764fde 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -6,8 +6,8 @@
  can_resize="true"
  height="600"
  min_height="600"
- width="1024"
- min_width="1024"
+ width="980"
+ min_width="980"
  name="Model Preview"
  title="UPLOAD MODEL"
  help_topic="upload_model" >
@@ -1656,121 +1656,121 @@ Analysed:
          width="462"
          visible="false">
          You dont have rights to upload mesh models. [[VURL] Find out how] to get certified.
-       </text>
+       </text> 
        <text text_color="Yellow" layout="topleft" top_pad="-1" left="6" name="status">
 [STATUS]
        </text>
     </panel>
   </panel>
+  
+  <text
+   follows="left|top"
+   layout="topleft"
+   left="640"
+   name="lod_label"
+   text_color="White"
+   top="4"
+   height="15"
+   width="290">
+    Preview:
+  </text>
   <panel
-    follows="top|left|bottom|right"
+   border="true"
+   bevel_style="none"
+   follows="top|left"
+   name="preview_panel"
+   top_pad="4"
+   width="325"
+   height="408"/>
+  <panel
+    follows="all"
+    can_resize="true"
+    height="140"
+    layout="topleft"
     name="right_panel"
-    top="0"
-    left="640"
-    width="375">
-    <text
+    top_pad="5"
+    width="340">
+    <combo_box
+      top_pad="3"
       follows="left|top"
+      height="18"
+      layout="topleft"
+      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_box>
+    <text
+      follows="top|left"
       layout="topleft"
-      left="0"
-      name="lod_label"
       text_color="White"
-      top="13"
-      height="15"
-      width="290">
-      Preview:
+      top="5"
+      left_pad="20"
+      name="label_display"
+      width="50">
+      Display...
     </text>
-    <panel
+    <check_box
       follows="top|left"
-      height="20"
-      name="right_upper_panel"
-      top="8"
-      left="60"
-      width="315">
-      <combo_box
-        top_pad="3"
-        follows="top|left"
-        height="18"
-        layout="topleft"
-        name="preview_lod_combo"
-        width="75"
-        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_box>
-    </panel>
-  </panel>
-  <panel
-     border="true"
-     bevel_style="none"
-     follows="top|left|right|bottom"
-     layout="topleft"
-     name="preview_panel"
-     top="30"
-     width="375"
-     height="525"/>
-
-   <panel
-     follows="left|right|bottom"
-     layout="topleft"
-     height="40"
-     name="lower_right_panel"
-     top_pad="5"
-     width="375">
-     <check_box
-       follows="right|bottom"
-       label="Edges"
+      label="Edges"
       label_text.text_color="White"
       layout="topleft"
+      left_delta="0"
       name="show_edges"
-      width="70"
-      left="0"
-      top_pad="8"/>
+      top_pad="8">
+    </check_box>
     <check_box
-      follows="right|bottom"
-      left_pad="8"
+      follows="top|left"
       label="Physics"
       label_text.text_color="White"
-      name="show_physics"/>
+      layout="topleft"
+      name="show_physics"
+      top_pad="8">
+    </check_box>
     <check_box
-      follows="right|bottom"
+      follows="top|left"
       label="Textures"
       label_text.text_color="White"
       layout="topleft"
       name="show_textures"
-      left_pad="0"/>
+      top_pad="8">
+    </check_box>
     <check_box
-      follows="right|bottom"
-      label="Weights"
+      follows="top|left"
+      label="Skin weights"
       label_text.text_color="White"
       layout="topleft"
       name="show_skin_weight"
-      left_pad="0"/>
+      top_pad="8">
+    </check_box>
     <check_box
-      follows="right|bottom"
+      follows="top|left"
       label="Joints"
       label_text.text_color="White"
       layout="topleft"
       name="show_joint_positions"
-      left_pad="0"/>
+      top_pad="8">
+    </check_box>
     <text
-      follows="right|bottom"
+      follows="top|left"
       layout="topleft"
       left="2"
       name="physics_explode_label"
+      top="85"
       width="150">
       Preview Spread:
     </text>
     <slider
       name="physics_explode"
-      follows="right|bottom"
-      valign="center"
-      left="105"
-      top_delta="-3"
+      follows="top|left"
+      top="100"
+      left="0"
       min_val="0.0"
       max_val="3.0"
       height="20"
-      width="120"/>
+      width="150"/>
   </panel>
 </floater>
-- 
cgit v1.2.3


From f851ce08d27c983423176e3508cebd9ac9f9cdd4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 6 Feb 2020 20:00:21 +0200
Subject: SL-548 Add control for joint positions in model upload preview

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 12 +++++++++++-
 1 file changed, 11 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 bd8b764fde..699ea7b9db 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1746,13 +1746,23 @@ Analysed:
       name="show_skin_weight"
       top_pad="8">
     </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"
-- 
cgit v1.2.3


From dd015ce7fc3f6ae3ccf0c6c7f04b2f1b94a90670 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 6 Feb 2020 20:33:09 +0200
Subject: SL-12673 Fixed resize

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 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 699ea7b9db..9009eeeb04 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1675,16 +1675,17 @@ Analysed:
     Preview:
   </text>
   <panel
+   follows="all"
+   layout="topleft"
    border="true"
    bevel_style="none"
-   follows="top|left"
    name="preview_panel"
    top_pad="4"
    width="325"
    height="408"/>
   <panel
-    follows="all"
-    can_resize="true"
+    follows="right|bottom"
+    can_resize="false"
     height="140"
     layout="topleft"
     name="right_panel"
-- 
cgit v1.2.3


From 67b908cd2020231f30386294e4d0c5f199a007a0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 7 Feb 2020 18:43:31 +0200
Subject: SL-379 WIP Joint overrides tab

---
 .../skins/default/xui/en/floater_model_preview.xml | 53 +++-------------------
 1 file changed, 7 insertions(+), 46 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 9009eeeb04..a69fa8c57c 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1304,62 +1304,23 @@
          height="100"
          left_delta="0"
          top_pad="0"
-         width="310">
+         width="330">
           <scroll_list.columns
-           label="*"
-           name="override"
-           relative_width="0.22"  />
+           label="Model"
+           name="model_name"
+           relative_width="0.40"  />
           <scroll_list.columns
            label="X"
            name="axis_x"
-           relative_width="0.26"  />
+           relative_width="0.20"  />
           <scroll_list.columns
            label="Y"
            name="axis_y"
-           relative_width="0.26"  />
+           relative_width="0.20"  />
           <scroll_list.columns
            label="Z"
            name="axis_z"
-           relative_width="0.26"  />
-        </scroll_list>
-        <text
-          layout="topleft"
-          follows="top|left"
-          height="15"
-          left_delta="0"
-          name="scale_overrides_descr"
-          top_pad="3"
-          width="300">
-          Scale overrides for joint '[JOINT]':
-        </text>
-        <scroll_list
-         layout="topleft"
-         follows="top|left"
-         name="scale_overrides_list"
-         column_padding="0"
-         draw_heading="true"
-         draw_stripes="false"
-         heading_height="23"
-         height="100"
-         left_delta="0"
-         top_pad="0"
-         width="310">
-          <scroll_list.columns
-           label="*"
-           name="override"
-           relative_width="0.22"  />
-          <scroll_list.columns
-           label="X"
-           name="axis_x"
-           relative_width="0.26"  />
-          <scroll_list.columns
-           label="Y"
-           name="axis_y"
-           relative_width="0.26"  />
-          <scroll_list.columns
-           label="Z"
-           name="axis_z"
-           relative_width="0.26"  />
+           relative_width="0.20"  />
         </scroll_list>
       </panel>
       <panel
-- 
cgit v1.2.3


From 6a3cb73009bccdef6ae1fbb5d8b632f90343ad91 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 10 Feb 2020 18:29:52 +0200
Subject: SL-379 Joint overrides tab

---
 .../newview/skins/default/xui/en/floater_model_preview.xml | 14 ++++++++++++--
 1 file changed, 12 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 a69fa8c57c..9ebcb0c09d 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1279,10 +1279,20 @@
          draw_stripes="false"
          commit_on_selection_change="true"
          heading_height="23"
-         height="253"
+         height="238"
          left="6"
          top_pad="0"
-         width="150"/>
+         width="200"/>
+        <text
+          layout="topleft"
+          follows="top|left"
+          height="15"
+          left="6"
+          name="conflicts_description"
+          top_pad="2"
+          width="200">
+          [CONFLICTS] conflicts in [JOINTS_COUNT] joints
+        </text>
         <text
           layout="topleft"
           follows="top|left"
-- 
cgit v1.2.3


From eaa9b152bfe9b5da44f724ddce1a2ecc86dc61bf Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 27 Mar 2020 19:05:23 +0200
Subject: SL-307 Implemented ability to specify color and changed flashing
 color

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

(limited to 'indra/newview/skins')

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>
-- 
cgit v1.2.3


From acb6e12135452d8d4e53a9a61e1fb50cdeec2469 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 30 Mar 2020 16:47:54 +0300
Subject: SL-379 Remake Overrides tab into Avatar

---
 .../skins/default/xui/en/floater_model_preview.xml | 222 ++++++++++-----------
 1 file changed, 106 insertions(+), 116 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 9ebcb0c09d..053c482831 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -47,12 +47,12 @@
 
   <panel
     follows="top|left"
-    height="580"
+    height="595"
     layout="topleft"
     left="3"
     name="left_panel"
     top_pad="0"
-    width="630">
+    width="635">
     <panel
       follows="all"
       height="50"
@@ -83,9 +83,9 @@
     </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"
@@ -100,12 +100,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="619" />
+             width="628" />
           <text
            follows="left|top"
            height="18"
@@ -696,7 +696,7 @@
              left="10"
              name="lod_tab_border"
              top_pad="20"
-             width="605" />
+             width="614" />
             <check_box
              follows="top|left"
              height="15"
@@ -738,12 +738,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"
@@ -1113,12 +1113,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"
@@ -1165,109 +1165,94 @@
              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"/>
-           <text
-             follows="top|left"
-             height="17"
-             left="40"
-             name="skin_too_many_joints"
-             text_color="Orange"
-             top_pad="-2"
-             width="150">
-             Too many skinned joints
-           </text>
-           <text
-             follows="top|left"
-             height="17"
-             left="40"
-             name="skin_unknown_joint"
-             text_color="Orange"
-             top_pad="-17"
-             width="150">
-             Model has an unknown joint(s)
-           </text>
-           <check_box
-             follows="top|left"
-             height="15"
-             label="Include joint positions"
-             label_text.text_color="White"
-             name="upload_joints"
-             left_delta="-20"
-             top_pad="1"/>
-           <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="16"/>
-           <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="overrides_panel"
-       title="Overrides">
+       title="Avatar">
         <view_border
          bevel_style="none"
          follows="top|left"
-         height="275"
+         height="306"
          layout="topleft"
          left="3"
-         name="log_tab_border"
+         name="avatar_tab_border"
          top_pad="0"
-         width="619" />
+         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="6"
+          left="20"
           name="joints_descr"
-          top="4"
-          width="300">
+          top="73"
+          width="150">
           Joints:
         </text>
         <scroll_list
@@ -1279,15 +1264,15 @@
          draw_stripes="false"
          commit_on_selection_change="true"
          heading_height="23"
-         height="238"
-         left="6"
+         height="199"
+         left_delta="0"
          top_pad="0"
          width="200"/>
         <text
           layout="topleft"
           follows="top|left"
           height="15"
-          left="6"
+          left_delta="0"
           name="conflicts_description"
           top_pad="2"
           width="200">
@@ -1299,7 +1284,7 @@
           height="15"
           left_pad="5"
           name="pos_overrides_descr"
-          top="4"
+          top="73"
           width="300">
           Position overrides for joint '[JOINT]':
         </text>
@@ -1314,23 +1299,23 @@
          height="100"
          left_delta="0"
          top_pad="0"
-         width="330">
+         width="385">
           <scroll_list.columns
            label="Model"
            name="model_name"
-           relative_width="0.40"  />
+           relative_width="0.49" />
           <scroll_list.columns
            label="X"
            name="axis_x"
-           relative_width="0.20"  />
+           relative_width="0.17" />
           <scroll_list.columns
            label="Y"
            name="axis_y"
-           relative_width="0.20"  />
+           relative_width="0.17" />
           <scroll_list.columns
            label="Z"
            name="axis_z"
-           relative_width="0.20"  />
+           relative_width="0.17" />
         </scroll_list>
       </panel>
       <panel
@@ -1341,12 +1326,12 @@
         <view_border
          bevel_style="none"
          follows="top|left"
-         height="275"
+         height="306"
          layout="topleft"
          left="3"
          name="log_tab_border"
          top_pad="0"
-         width="619" />
+         width="628" />
         <text_editor
          type="string"
          length="1"
@@ -1355,10 +1340,10 @@
          font="SansSerif"
          ignore_tab="false"
          layout="topleft"
-         height="275"
+         height="306"
          left="4"
          top="0"
-         right="-11"
+         right="-1"
          max_length="65536"
          name="log_text"
          parse_urls="true"
@@ -1371,7 +1356,7 @@
     <panel
      follows="top|left|bottom"
      layout="topleft"
-     height="197"
+     height="195"
      left="4"
      border="true"
      name="weights_and_warning_panel"
@@ -1611,7 +1596,7 @@ Analysed:
          name="warning_title"
          top_pad="5"
          text_color="DrYellow"
-         visible="false"
+         visible="true"
          width="40">
          NOTE:
        </text>
@@ -1622,13 +1607,18 @@ Analysed:
          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="-1" left="6" name="status">
+       <text
+         text_color="Yellow"
+         layout="topleft"
+         top_pad="-2"
+         left="6"
+         name="status">
 [STATUS]
        </text>
     </panel>
-- 
cgit v1.2.3


From aaddcc0b704f28555fbd4a1f6068f44242966295 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 30 Mar 2020 20:04:25 +0300
Subject: SL-307 A separator to see where model loading logs ends and other
 state starts

---
 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 053c482831..aeed3b4623 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -39,11 +39,11 @@
   <string name="simplifying">Simplifying...</string>
   <string name="tbd">TBD</string>
   
-  <!-- Warnings from model loader-->
+  <!-- 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>
 
   <panel
     follows="top|left"
-- 
cgit v1.2.3


From 3c2f3edb5fefff69e370f4e427dd23236cf8edbf Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 31 Mar 2020 15:40:48 +0300
Subject: SL-379 Render selected joint yellow when Avatar tab is open

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 2 +-
 1 file changed, 1 insertion(+), 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 aeed3b4623..da4190c4fc 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1169,7 +1169,7 @@
       <panel
        label="Overrides"
        layout="topleft"
-       name="overrides_panel"
+       name="avatar_panel"
        title="Avatar">
         <view_border
          bevel_style="none"
-- 
cgit v1.2.3


From b0b155efefe224bd645a28efc24eb8b0b3e5580b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 Apr 2020 17:58:58 +0300
Subject: SL-13062 Fixed Scaled-down 'Upload Model' floater having a frame at
 the bottom

The way legacy_header_height works is just wrong...
---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 da4190c4fc..e8c64dfef7 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -4,13 +4,14 @@
  can_drag_on_left="false"
  can_minimize="true"
  can_resize="true"
- height="600"
- min_height="600"
+ 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>
@@ -51,7 +52,7 @@
     layout="topleft"
     left="3"
     name="left_panel"
-    top_pad="0"
+    top_pad="25"
     width="635">
     <panel
       follows="all"
@@ -1630,7 +1631,7 @@ Analysed:
    left="640"
    name="lod_label"
    text_color="White"
-   top="4"
+   top="29"
    height="15"
    width="290">
     Preview:
-- 
cgit v1.2.3


From a0e91e9e505e747f876712fe8ec5c250b56e1dcf Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 24 Apr 2020 18:05:14 +0300
Subject: SL-307 Improvements to flashing color

---
 .../default/textures/containers/TabTop_Right_Flashing.png | Bin 0 -> 252 bytes
 indra/newview/skins/default/textures/textures.xml         |   1 +
 .../skins/default/xui/en/floater_model_preview.xml        |   5 ++++-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Right_Flashing.png

(limited to 'indra/newview/skins')

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
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Right_Flashing.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 624dca48d2..980dcf76bf 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -628,6 +628,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 e8c64dfef7..66878f227b 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -90,7 +90,10 @@
       width="635"
       name="import_tab"
       tab_position="top"
-      enable_tabs_flashing="true">
+      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"
-- 
cgit v1.2.3


From 0570d6d3c1b56ebcd0309153ec0cebc7586a6286 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 27 Jul 2020 22:32:49 +0300
Subject: SL-13483 Rename Avatar tab to "Rigging"

---
 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 66878f227b..4fa0b9af7d 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1173,8 +1173,8 @@
       <panel
        label="Overrides"
        layout="topleft"
-       name="avatar_panel"
-       title="Avatar">
+       name="rigging_panel"
+       title="Rigging">
         <view_border
          bevel_style="none"
          follows="top|left"
-- 
cgit v1.2.3


From 7a9a114e168ea68345b54e80b3cfbac7deb4764a Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 3 Aug 2020 19:14:09 +0300
Subject: SL-13698 FIXED crash on model upload

---
 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 4fa0b9af7d..9c1a9d2880 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -45,6 +45,7 @@
   <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"
-- 
cgit v1.2.3


From d240d381a26605614d1b2ec37861ef22e92e08c2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 12 Aug 2020 00:59:45 +0300
Subject: SL-13583 Some behavior tweaks #1

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 12 ++++++++++--
 1 file changed, 10 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 9c1a9d2880..02a21764ce 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1331,7 +1331,7 @@
         <view_border
          bevel_style="none"
          follows="top|left"
-         height="306"
+         height="289"
          layout="topleft"
          left="3"
          name="log_tab_border"
@@ -1345,7 +1345,7 @@
          font="SansSerif"
          ignore_tab="false"
          layout="topleft"
-         height="306"
+         height="289"
          left="4"
          top="0"
          right="-1"
@@ -1356,6 +1356,14 @@
          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
-- 
cgit v1.2.3