From 599e08181544f214142703928a6d242a0ae72e60 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 23 Feb 2019 20:08:03 +0200
Subject: Backed out changeset: d5795c04fecc

---
 .../skins/default/xui/en/floater_model_preview.xml | 369 +++++++--------------
 1 file changed, 114 insertions(+), 255 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 e073268b0a..5a86eb06fb 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="true"
- can_resize="true"
- height="600"
- min_height="600"
- width="1024"
- min_width="1024"
+ can_minimize="false"
+ can_resize="false"
+ height="480"
+ min_height="480"
+ width="980"
+ min_width="980"
  name="Model Preview"
  title="UPLOAD MODEL"
  help_topic="upload_model" >
@@ -33,21 +33,19 @@
   <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="580"
-    layout="topleft"
-    left="3"
-    name="left_panel"
-    top_pad="0"
-    width="630">
+<panel
+  follows="top|left"
+  height="455"
+  layout="topleft"
+  left="3"
+  name="left_panel"
+  top_pad="10"
+  width="630">
     <panel
       follows="all"
       height="50"
@@ -757,9 +755,8 @@
                       name="first_step_name"
                       text_color="White"
                       top_pad="0"
-                      width="210"
-                      valign="center">
-                      Step 1: Pick a physics model :
+                      width="210">
+                      Step 1: Level of Detail
                     </text>
                     <combo_box
                       follows="left|top"
@@ -801,7 +798,7 @@
               layout="topleft"
               left="18"
               name="physics_tab_border"
-              top_pad="10"
+              top_pad="15"
               width="589"/>
                 <panel
                   bg_alpha_color="0 0 0 0"
@@ -810,7 +807,7 @@
                   follows="top|left"
                   left="18"
                   name="physics analysis"
-                  top_pad="10"
+                  top_pad="15"
                   visible="true"
                   width="589">
                     <text
@@ -822,7 +819,7 @@
                       name="method_label"
                       text_color="White"
                       top_pad="0">
-                      Step 2: Convert to hulls (optional)
+                      Step 2: Analyze
                     </text>
                     <text
                       follows="top|left"
@@ -908,7 +905,7 @@
               layout="topleft"
               left="18"
               name="physics_tab_border"
-              top_pad="10"
+              top_pad="15"
               width="589"/>
                 <panel
                   bg_alpha_color="0 0 0 0"
@@ -917,7 +914,7 @@
                   height="66"
                   left="18"
                   name="physics simplification"
-                  top_pad="10"
+                  top_pad="15"
                   width="589">
                     <text
                       text_color="White"
@@ -1016,7 +1013,7 @@
               layout="topleft"
               left="18"
               name="physics_tab_border"
-              top_pad="10"
+              top_pad="15"
               width="589"/>
                 <panel
                   bg_alpha_color="0 0 0 0"
@@ -1078,9 +1075,10 @@
                  follows="left|top"
                  height="19"
                  layout="topleft"
-                 top_pad="5"
+                 left_pad="5"
+                 top_delta="0"
                  name="physics message"
-                 width="589">
+                 width="270">
                      <icon
                       follows="left|top"
                       height="16"
@@ -1095,7 +1093,7 @@
                       layout="topleft"
                       left_pad="2"
                       name="physics_status_message_text"
-                      width="573"
+                      width="252"
                       top_delta="3"/>
                 </panel>
         </panel>
@@ -1221,14 +1219,13 @@
      </panel>
     </tab_container>
     <panel
-     follows="top|left|bottom"
-     layout="topleft"
-     height="184"
-     left="4"
-     border="true"
+     follows="top|left"
+     height="80"
+     layout="top|left"
+     left="0"
      name="weights_and_warning_panel"
      top_pad="3"
-     width="629">
+     width="625">
        <button
          follows="top|left"
          label="Calculate weights &amp; fee"
@@ -1268,10 +1265,10 @@
          label_color="White"
          layout="topleft"
          name="reset_btn"
-         right="-5"
+         right="-2"
          top="3"
          height="20"
-         width="265"/>
+         width="275"/>
        <!-- ========== WEIGHTS ==========-->
        <text
          follows="top|left"
@@ -1290,7 +1287,7 @@
          left_pad="0"
          name="prim_weight"
          top_delta="0"
-         width="130"
+         width="120"
          word_wrap="true">
          Land impact: [EQ]
        </text>
@@ -1300,7 +1297,7 @@
          left_pad="0"
          name="download_weight"
          top_delta="0"
-         width="130"
+         width="100"
          word_wrap="true">
          Download: [ST]
        </text>
@@ -1310,7 +1307,7 @@
          layout="topleft"
          left_pad="0"
          name="physics_weight"
-         width="130"
+         width="90"
          word_wrap="true">
          Physics: [PH]
        </text>
@@ -1320,148 +1317,17 @@
          layout="topleft"
          left_pad="0"
          name="server_weight"
-         width="130"
+         width="83"
          word_wrap="true">
          Server: [SIM]
        </text>
-       <!-- =========== 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>
+       <!-- ========== NOTE MESSAGE ========== -->
        <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="5"
+         top_pad="10"
          text_color="DrYellow"
          visible="false"
          width="40">
@@ -1480,110 +1346,104 @@ 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">
-[STATUS]
-       </text>
+       <text text_color="Yellow" layout="topleft" top_delta="20" left="6" name="status">[STATUS]</text>
+  
     </panel>
-  </panel>
-  <panel
-    follows="top|left|bottom|right"
-    can_resize="true"
-    name="right_panel"
-    top="0"
-    left="640"
-    background_visible="true"
-    width="375">
-    <text
+</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"
       follows="left|top"
+      height="18"
       layout="topleft"
-      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">
+      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>
-    </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"
+    </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"
       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"
@@ -1593,13 +1453,12 @@ Analysed:
     </text>
     <slider
       name="physics_explode"
-      follows="right|bottom"
-      valign="center"
-      top="15"
-      left="80"
+      follows="top|left"
+      top="100"
+      left="0"
       min_val="0.0"
       max_val="3.0"
       height="20"
-      width="120"/>
-  </panel>
+      width="150"/>
+</panel>
 </floater>
-- 
cgit v1.2.3