From 7b7b8a8da8f3a7e726b7de2b152cd00c67df0f18 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 7 Jul 2021 22:34:26 +0300
Subject: DRTVWR-542 WIP

---
 .../skins/default/xui/en/floater_model_preview.xml       | 16 ++++++++++++++++
 1 file changed, 16 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 7f863756eb..96bda42316 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -176,6 +176,10 @@
                  name="Generate"
                  label="Generate"
                  value="Generate" />
+                <item
+                 name="MeshOpt"
+                 label="MeshOpt"
+                 value="MeshOpt" />
             </combo_box>
             <line_editor
              follows="left|top"
@@ -305,6 +309,10 @@
                  name="Generate"
                  label="Generate"
                  value="Generate" />
+                <item
+                 name="MeshOpt"
+                 label="MeshOpt"
+                 value="MeshOpt" />
                 <item
                  name="Use LoD above"
                  label="Use LoD above"
@@ -438,6 +446,10 @@
                  name="Generate"
                  label="Generate"
                  value="Generate" />
+                <item
+                 name="MeshOpt"
+                 label="MeshOpt"
+                 value="MeshOpt" />
                 <item
                  name="Use LoD above"
                  label="Use LoD above"
@@ -571,6 +583,10 @@
                  name="Generate"
                  label="Generate"
                  value="Generate" />
+                <item
+                 name="MeshOpt"
+                 label="MeshOpt"
+                 value="MeshOpt" />
                 <item
                  name="Use LoD above"
                  label="Use LoD above"
-- 
cgit v1.2.3


From 938969c811732a3e2faf0229301de286bd12c1a5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 12 Jul 2021 19:18:25 +0300
Subject: DRTVWR-542 WIP #6

Trying out 'sloppy' variant
---
 .../skins/default/xui/en/floater_model_preview.xml       | 16 ++++++++++++++++
 1 file changed, 16 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 96bda42316..230284555c 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -180,6 +180,10 @@
                  name="MeshOpt"
                  label="MeshOpt"
                  value="MeshOpt" />
+                <item
+                 name="MeshOptSloppy"
+                 label="MeshOptSloppy"
+                 value="MeshOptSloppy" />
             </combo_box>
             <line_editor
              follows="left|top"
@@ -313,6 +317,10 @@
                  name="MeshOpt"
                  label="MeshOpt"
                  value="MeshOpt" />
+                <item
+                 name="MeshOptSloppy"
+                 label="MeshOptSloppy"
+                 value="MeshOptSloppy" />
                 <item
                  name="Use LoD above"
                  label="Use LoD above"
@@ -450,6 +458,10 @@
                  name="MeshOpt"
                  label="MeshOpt"
                  value="MeshOpt" />
+                <item
+                 name="MeshOptSloppy"
+                 label="MeshOptSloppy"
+                 value="MeshOptSloppy" />
                 <item
                  name="Use LoD above"
                  label="Use LoD above"
@@ -587,6 +599,10 @@
                  name="MeshOpt"
                  label="MeshOpt"
                  value="MeshOpt" />
+                <item
+                 name="MeshOptSloppy"
+                 label="MeshOptSloppy"
+                 value="MeshOptSloppy" />
                 <item
                  name="Use LoD above"
                  label="Use LoD above"
-- 
cgit v1.2.3


From a5675bedbb2bd34ce03dd16651dc74d8078efea9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 15 Jul 2021 17:34:16 +0300
Subject: SL-443 Keybindings: Support reassigment of script interaction button

---
 .../skins/default/xui/en/control_table_contents_media.xml      | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/control_table_contents_media.xml b/indra/newview/skins/default/xui/en/control_table_contents_media.xml
index ce5d3556b6..a97c45dd6f 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents_media.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents_media.xml
@@ -73,4 +73,14 @@
          name="lst_action"
          value="Start Gesture" />
     </rows>
+    <rows
+     name="sript_trigger_lbutton"
+     value="sript_trigger_lbutton">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Interact (Script LMB)" />
+    </rows>
 </contents>
-- 
cgit v1.2.3


From 9aaac1bb985f5bd65f9b0fe985c47cd30dcfd166 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 23 Jul 2021 21:30:13 +0300
Subject: DRTVWR-542 Attempt to simplify all faces of an object as a whole and
 split back into faces

---
 .../skins/default/xui/en/floater_model_preview.xml       | 16 ++++++++++++++++
 1 file changed, 16 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 230284555c..5c78ef55d1 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -184,6 +184,10 @@
                  name="MeshOptSloppy"
                  label="MeshOptSloppy"
                  value="MeshOptSloppy" />
+                <item
+                 name="MeshOptCombine"
+                 label="MeshOptCombine"
+                 value="MeshOptCombine" />
             </combo_box>
             <line_editor
              follows="left|top"
@@ -321,6 +325,10 @@
                  name="MeshOptSloppy"
                  label="MeshOptSloppy"
                  value="MeshOptSloppy" />
+                <item
+                 name="MeshOptCombine"
+                 label="MeshOptCombine"
+                 value="MeshOptCombine" />
                 <item
                  name="Use LoD above"
                  label="Use LoD above"
@@ -462,6 +470,10 @@
                  name="MeshOptSloppy"
                  label="MeshOptSloppy"
                  value="MeshOptSloppy" />
+                <item
+                 name="MeshOptCombine"
+                 label="MeshOptCombine"
+                 value="MeshOptCombine" />
                 <item
                  name="Use LoD above"
                  label="Use LoD above"
@@ -603,6 +615,10 @@
                  name="MeshOptSloppy"
                  label="MeshOptSloppy"
                  value="MeshOptSloppy" />
+                <item
+                 name="MeshOptCombine"
+                 label="MeshOptCombine"
+                 value="MeshOptCombine" />
                 <item
                  name="Use LoD above"
                  label="Use LoD above"
-- 
cgit v1.2.3


From 1531a31cd9907e5294df5cedbda2b9d1e3adb68b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 28 Jul 2021 21:25:18 +0300
Subject: DRTVWR-542 Rename simplification methods in UI and add a fallback

---
 .../skins/default/xui/en/floater_model_preview.xml | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 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 5c78ef55d1..cd67adf42a 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -178,15 +178,15 @@
                  value="Generate" />
                 <item
                  name="MeshOpt"
-                 label="MeshOpt"
+                 label="Simplify per face"
                  value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
-                 label="MeshOptSloppy"
+                 label="Simplify sloppy"
                  value="MeshOptSloppy" />
                 <item
                  name="MeshOptCombine"
-                 label="MeshOptCombine"
+                 label="Simplify per object"
                  value="MeshOptCombine" />
             </combo_box>
             <line_editor
@@ -319,15 +319,15 @@
                  value="Generate" />
                 <item
                  name="MeshOpt"
-                 label="MeshOpt"
+                 label="Simplify per face"
                  value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
-                 label="MeshOptSloppy"
+                 label="Simplify sloppy"
                  value="MeshOptSloppy" />
                 <item
                  name="MeshOptCombine"
-                 label="MeshOptCombine"
+                 label="Simplify per object"
                  value="MeshOptCombine" />
                 <item
                  name="Use LoD above"
@@ -464,15 +464,15 @@
                  value="Generate" />
                 <item
                  name="MeshOpt"
-                 label="MeshOpt"
+                 label="Simplify per face"
                  value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
-                 label="MeshOptSloppy"
+                 label="Simplify sloppy"
                  value="MeshOptSloppy" />
                 <item
                  name="MeshOptCombine"
-                 label="MeshOptCombine"
+                 label="Simplify per object"
                  value="MeshOptCombine" />
                 <item
                  name="Use LoD above"
@@ -609,15 +609,15 @@
                  value="Generate" />
                 <item
                  name="MeshOpt"
-                 label="MeshOpt"
+                 label="Simplify per face"
                  value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
-                 label="MeshOptSloppy"
+                 label="Simplify sloppy"
                  value="MeshOptSloppy" />
                 <item
                  name="MeshOptCombine"
-                 label="MeshOptCombine"
+                 label="Simplify per object"
                  value="MeshOptCombine" />
                 <item
                  name="Use LoD above"
-- 
cgit v1.2.3


From 1a1793244002effe46cedf63180de60f4bc69a9a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 4 Aug 2021 21:14:00 +0300
Subject: DRTVWR-542 Automated method selection

Normally simplification methods apply for whole upload, but this one selects methods per model or per face.
---
 .../skins/default/xui/en/floater_model_preview.xml | 48 ++++++++++++++--------
 1 file changed, 32 insertions(+), 16 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 cd67adf42a..db9d296fa5 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -176,6 +176,14 @@
                  name="Generate"
                  label="Generate"
                  value="Generate" />
+                <item
+                 name="MeshOpt"
+                 label="Simplify (auto)"
+                 value="MeshOpt" />
+                <item
+                 name="MeshOptCombine"
+                 label="Simplify per object"
+                 value="MeshOptCombine" />
                 <item
                  name="MeshOpt"
                  label="Simplify per face"
@@ -184,10 +192,6 @@
                  name="MeshOptSloppy"
                  label="Simplify sloppy"
                  value="MeshOptSloppy" />
-                <item
-                 name="MeshOptCombine"
-                 label="Simplify per object"
-                 value="MeshOptCombine" />
             </combo_box>
             <line_editor
              follows="left|top"
@@ -317,6 +321,14 @@
                  name="Generate"
                  label="Generate"
                  value="Generate" />
+                <item
+                 name="MeshOpt"
+                 label="Simplify (auto)"
+                 value="MeshOpt" />
+                <item
+                 name="MeshOptCombine"
+                 label="Simplify per object"
+                 value="MeshOptCombine" />
                 <item
                  name="MeshOpt"
                  label="Simplify per face"
@@ -325,10 +337,6 @@
                  name="MeshOptSloppy"
                  label="Simplify sloppy"
                  value="MeshOptSloppy" />
-                <item
-                 name="MeshOptCombine"
-                 label="Simplify per object"
-                 value="MeshOptCombine" />
                 <item
                  name="Use LoD above"
                  label="Use LoD above"
@@ -462,6 +470,14 @@
                  name="Generate"
                  label="Generate"
                  value="Generate" />
+                <item
+                 name="MeshOpt"
+                 label="Simplify (auto)"
+                 value="MeshOpt" />
+                <item
+                 name="MeshOptCombine"
+                 label="Simplify per object"
+                 value="MeshOptCombine" />
                 <item
                  name="MeshOpt"
                  label="Simplify per face"
@@ -470,10 +486,6 @@
                  name="MeshOptSloppy"
                  label="Simplify sloppy"
                  value="MeshOptSloppy" />
-                <item
-                 name="MeshOptCombine"
-                 label="Simplify per object"
-                 value="MeshOptCombine" />
                 <item
                  name="Use LoD above"
                  label="Use LoD above"
@@ -607,6 +619,14 @@
                  name="Generate"
                  label="Generate"
                  value="Generate" />
+                <item
+                 name="MeshOpt"
+                 label="Simplify (auto)"
+                 value="MeshOpt" />
+                <item
+                 name="MeshOptCombine"
+                 label="Simplify per object"
+                 value="MeshOptCombine" />
                 <item
                  name="MeshOpt"
                  label="Simplify per face"
@@ -615,10 +635,6 @@
                  name="MeshOptSloppy"
                  label="Simplify sloppy"
                  value="MeshOptSloppy" />
-                <item
-                 name="MeshOptCombine"
-                 label="Simplify per object"
-                 value="MeshOptCombine" />
                 <item
                  name="Use LoD above"
                  label="Use LoD above"
-- 
cgit v1.2.3


From 396c8bb9fe52e86a857a49020bc0feb33503a6a1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 6 Sep 2021 23:48:04 +0300
Subject: Revert "SL-443 Keybindings: Support reassigment of script interaction
 button"

This reverts commit a5675bedbb2bd34ce03dd16651dc74d8078efea9.
Commit slipped in by accident
---
 .../skins/default/xui/en/control_table_contents_media.xml      | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/control_table_contents_media.xml b/indra/newview/skins/default/xui/en/control_table_contents_media.xml
index a97c45dd6f..ce5d3556b6 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents_media.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents_media.xml
@@ -73,14 +73,4 @@
          name="lst_action"
          value="Start Gesture" />
     </rows>
-    <rows
-     name="sript_trigger_lbutton"
-     value="sript_trigger_lbutton">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Interact (Script LMB)" />
-    </rows>
 </contents>
-- 
cgit v1.2.3


From ca629c362c5ed248547f9df057703079c95331e7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 9 Sep 2021 20:59:21 +0300
Subject: SL-15965 Support wider range of parsing errors

---
 .../newview/skins/default/xui/en/floater_model_preview.xml | 14 ++++++++++++++
 1 file changed, 14 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 db9d296fa5..05990e28d8 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -45,7 +45,21 @@
   <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>
+  <string name="PositionNaN">Found NaN while loading position data from DAE-Model, invalid model.</string>
+  <string name="NormalsNaN">Found NaN while loading normals from DAE-Model, invalid model.</string>
+  <string name="NegativeScaleTrans">Negative scale detected, unsupported transform. domInstance_geometry: [LABEL]</string>
+  <string name="NegativeScaleNormTrans">Negative scale detected, unsupported post-normalization transform. domInstance_geometry: [LABEL]</string>
+  <string name="CantResolveGeometryUrl">Unable to resolve geometry URL.</string>
+  <string name="ParsingErrorBadElement">Bad element</string>
+  <string name="ParsingErrorCantParseScene">Scene could not be parsed</string>
+  <string name="ParsingErrorCorrupt">Error with dae - traditionally indicates a corrupt file.</string>
+  <string name="ParsingErrorNoController">Could not verify controller</string>
+  <string name="ParsingErrorNoDoc">Can't find internal doc</string>
+  <string name="ParsingErrorNoRoot">Document has no root</string>
+  <string name="ParsingErrorNoScene">Document has no visual_scene</string>
+  <string name="ParsingErrorPositionInvalidModel">Unable to process mesh without position data. Invalid model.</string>
 
   <panel
     follows="top|left"
-- 
cgit v1.2.3


From 768b7a4d33b64dc3e9d7f7c0c384bb2aa37b458b Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 9 Nov 2021 17:17:49 +0200
Subject: SL-16330 Clean up vertical sync handling, add to UI

---
 .../default/xui/en/floater_preferences_graphics_advanced.xml      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 7786ba8a1c..cba75e8ea7 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -334,15 +334,15 @@
     width="256" />
 
   <check_box
-    control_name="RenderVBOEnable"
+    control_name="RenderVSyncEnable"
     height="16"
     initial_value="true"
-    label="Enable OpenGL Vertex Buffer Objects"
+    label="Enable VSync"
     layout="topleft"
     left="30"
     top_delta="16"
-    name="vbo"
-    tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
+    name="vsync"
+    tool_tip="Synchronizes the frame rate to the refresh rate of the monitor, which results in smooth performance."
     width="315" />
 
   <check_box
-- 
cgit v1.2.3


From ca0b9a3753fa3b42d4ac8183adcf30d957f55016 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 9 Nov 2021 20:25:25 +0000
Subject: SL-16329 - track frame time and jitter (as average deviation frame to
 frame) in stats window

---
 indra/newview/skins/default/xui/en/floater_stats.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index e4f735740b..6f84930c75 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -35,6 +35,25 @@
                   decimal_digits="1"
                   show_bar="true"
                   show_history="true"/>
+        <stat_bar name="frame_mean"
+                  label="frame (mean)"
+                  unit_label="ms"
+                  stat="frametime"
+                  decimal_digits="1"
+                  show_bar="false"
+                  show_history="false"/>
+        <stat_bar name="frame_median"
+                  label="frame (median)"
+                  unit_label="ms"
+                  stat="frametime"
+                  show_median="true"
+                  decimal_digits="1"
+                  show_bar="false"
+                  show_history="false"/>
+        <stat_bar name="framet_jitter"
+                  label="jitter"
+                  decimal_digits="1"
+                  stat="frametimejitter"/>
        <stat_bar name="bandwidth"
                   label="UDP Data Received"
                   stat="activemessagedatareceived"
-- 
cgit v1.2.3


From 7c561ca1c7732d1d95562069565f605f46e8c9e3 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 10 Nov 2021 13:02:18 +0200
Subject: SL-16330 move VSync checkbox to General group

---
 .../en/floater_preferences_graphics_advanced.xml   | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index cba75e8ea7..4f355cce00 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -102,6 +102,18 @@
        Low
   </text>
 
+  <check_box
+    control_name="RenderVSyncEnable"
+    height="16"
+    initial_value="true"
+    label="Enable VSync"
+    layout="topleft"
+    left="30"
+    top_delta="16"
+    name="vsync"
+    tool_tip="Synchronizes the frame rate to the refresh rate of the monitor, which results in smooth performance."
+    width="315" />
+
   <text
     type="string"
     length="1"
@@ -333,18 +345,6 @@
     top_delta="16"
     width="256" />
 
-  <check_box
-    control_name="RenderVSyncEnable"
-    height="16"
-    initial_value="true"
-    label="Enable VSync"
-    layout="topleft"
-    left="30"
-    top_delta="16"
-    name="vsync"
-    tool_tip="Synchronizes the frame rate to the refresh rate of the monitor, which results in smooth performance."
-    width="315" />
-
   <check_box
     control_name="RenderCompressTextures"
     height="16"
-- 
cgit v1.2.3


From 33f52ee51dad85802d124e987aa6ee9b7faf0cb2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 10 Nov 2021 17:48:55 +0200
Subject: SL-14403 Removed glod

---
 .../newview/skins/default/xui/en/floater_about.xml |  1 -
 .../skins/default/xui/en/floater_model_preview.xml | 64 ++++++++--------------
 2 files changed, 24 insertions(+), 41 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 71f4d81195..bde7aec672 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -101,7 +101,6 @@ Dummy Name replaced at run time
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
         FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
-        GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
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 05990e28d8..d08bc92e5d 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -187,24 +187,20 @@
                  label="Load from file"
                  value="Load from file" />
                 <item
-                 name="Generate"
-                 label="Generate"
-                 value="Generate" />
-                <item
-                 name="MeshOpt"
-                 label="Simplify (auto)"
-                 value="MeshOpt" />
+                 name="MeshOpt Auto"
+                 label="Generate Auto"
+                 value="MeshOpt Auto" />
                 <item
                  name="MeshOptCombine"
-                 label="Simplify per object"
+                 label="Generate Precise"
                  value="MeshOptCombine" />
                 <item
                  name="MeshOpt"
-                 label="Simplify per face"
+                 label="Generate per face"
                  value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
-                 label="Simplify sloppy"
+                 label="Generate Sloppy"
                  value="MeshOptSloppy" />
             </combo_box>
             <line_editor
@@ -332,24 +328,20 @@
                  label="Load from file"
                  value="Load from file" />
                 <item
-                 name="Generate"
-                 label="Generate"
-                 value="Generate" />
-                <item
-                 name="MeshOpt"
-                 label="Simplify (auto)"
-                 value="MeshOpt" />
+                 name="MeshOpt Auto"
+                 label="Generate Auto"
+                 value="MeshOpt Auto" />
                 <item
                  name="MeshOptCombine"
-                 label="Simplify per object"
+                 label="Generate Precise"
                  value="MeshOptCombine" />
                 <item
                  name="MeshOpt"
-                 label="Simplify per face"
+                 label="Generate per face"
                  value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
-                 label="Simplify sloppy"
+                 label="Generate Sloppy"
                  value="MeshOptSloppy" />
                 <item
                  name="Use LoD above"
@@ -481,24 +473,20 @@
                  label="Load from file"
                  value="Load from file" />
                 <item
-                 name="Generate"
-                 label="Generate"
-                 value="Generate" />
-                <item
-                 name="MeshOpt"
-                 label="Simplify (auto)"
-                 value="MeshOpt" />
+                 name="MeshOpt Auto"
+                 label="Generate Auto"
+                 value="MeshOpt Auto" />
                 <item
                  name="MeshOptCombine"
-                 label="Simplify per object"
+                 label="Generate Precise"
                  value="MeshOptCombine" />
                 <item
                  name="MeshOpt"
-                 label="Simplify per face"
+                 label="Generate per face"
                  value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
-                 label="Simplify sloppy"
+                 label="Generate Sloppy"
                  value="MeshOptSloppy" />
                 <item
                  name="Use LoD above"
@@ -630,24 +618,20 @@
                  label="Load from file"
                  value="Load from file" />
                 <item
-                 name="Generate"
-                 label="Generate"
-                 value="Generate" />
-                <item
-                 name="MeshOpt"
-                 label="Simplify (auto)"
-                 value="MeshOpt" />
+                 name="MeshOpt Auto"
+                 label="Generate Auto"
+                 value="MeshOpt Auto" />
                 <item
                  name="MeshOptCombine"
-                 label="Simplify per object"
+                 label="Generate Precise"
                  value="MeshOptCombine" />
                 <item
                  name="MeshOpt"
-                 label="Simplify per face"
+                 label="Generate per face"
                  value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
-                 label="Simplify sloppy"
+                 label="Generate Sloppy"
                  value="MeshOptSloppy" />
                 <item
                  name="Use LoD above"
-- 
cgit v1.2.3


From 27c1f52e6e484c778448d026600bdbcad7d19fb9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 10 Nov 2021 18:00:49 +0200
Subject: SL-15521 Fix debian license file not mentioning meshoptimizer

Just in case
---
 indra/newview/skins/default/xui/en/floater_about.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index bde7aec672..eb07425dfe 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -105,6 +105,7 @@ Dummy Name replaced at run time
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+        meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
         ogg/vorbis Copyright (C) 2002, Xiphophorus
         OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
         PCRE Copyright (c) 1997-2012 University of Cambridge
-- 
cgit v1.2.3


From 39733ba1cdd137941f42ce135103877ba769aafc Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Mon, 29 Nov 2021 15:18:53 -0700
Subject: DRTVWR-542 merge, purge GLOD copyrights from xml

---
 indra/newview/skins/default/xui/da/floater_about.xml | 1 -
 indra/newview/skins/default/xui/de/floater_about.xml | 1 -
 indra/newview/skins/default/xui/es/floater_about.xml | 1 -
 indra/newview/skins/default/xui/fr/floater_about.xml | 1 -
 indra/newview/skins/default/xui/it/floater_about.xml | 1 -
 indra/newview/skins/default/xui/ja/floater_about.xml | 1 -
 indra/newview/skins/default/xui/pt/floater_about.xml | 1 -
 indra/newview/skins/default/xui/ru/floater_about.xml | 1 -
 indra/newview/skins/default/xui/tr/floater_about.xml | 1 -
 indra/newview/skins/default/xui/zh/floater_about.xml | 1 -
 10 files changed, 10 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index 7654f0dcd6..b322e67bb7 100644
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -60,7 +60,6 @@ DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 20
 expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
 FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
 GL Copyright (C) 1999-2004 Brian Paul.
-GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
 google-perftools Copyright (c) 2005, Google Inc.
 Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
 jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index 42e23b2089..b2708f7141 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -19,7 +19,6 @@ mit Open-Source-Beiträgen von:</text>
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
         FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm und Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
-        GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University sowie David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW).
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 8f143cf072..f59f534908 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -19,7 +19,6 @@ con contribuciones de código abierto de:</text>
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
         FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm y Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
-        GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University y David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index 1e2a14ab3e..df6b61e293 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -19,7 +19,6 @@ avec les contributions Open Source de :</text>
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
         FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm et Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
-        GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University, et David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index 9603238b66..edb334e13e 100644
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -19,7 +19,6 @@ con contributi open source da:</text>
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
         FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm e Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
-        GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University e David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index cf5e97bd8d..6a39d057e2 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -19,7 +19,6 @@ DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 20
 expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
 FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
 GL Copyright (C) 1999-2004 Brian Paul.
-GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
 google-perftools Copyright (c) 2005, Google Inc.
 Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
 jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index 65c457f822..3c0ca332ac 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -19,7 +19,6 @@ com contribuições de código aberto de:</text>
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
         FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
-        GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University e David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
index ee9f82847d..44216e0430 100644
--- a/indra/newview/skins/default/xui/ru/floater_about.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about.xml
@@ -19,7 +19,6 @@
         expat (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
         FreeType (C) 1996-2002, 2006 David Turner, Robert Wilhelm и Werner Lemberg.
         GL (C) 1999-2004 Brian Paul.
-        GLOD (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Университет Джона Гопкинса и David Luebke, Brenden Schubert, Университет Вирджинии.
         google-perftools (c) 2005, Google Inc.
         Havok.com(TM) (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 (C) 2001, David Taubman, Университет Нового Южного Уэльса (UNSW)
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
index b91575954b..faa504a996 100644
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -19,7 +19,6 @@ açık kaynak kod katkısında bulunanlar şunlardır:</text>
         expat Telif Hakkı (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
         FreeType Telif Hakkı (C) 1996-2002, 2006 David Turner, Robert Wilhelm ve Werner Lemberg.
         GL Telif Hakkı (C) 1999-2004 Brian Paul.
-        GLOD Telif Hakkı (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University ve David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Telif Hakkı (c) 2005, Google Inc.
         Havok.com(TM) Telif Hakkı (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Telif Hakkı (C) 2001, David Taubman, The University of New South Wales (UNSW)
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index 9f6b4421a9..d7d2a52750 100644
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -19,7 +19,6 @@
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
         FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
-        GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-- 
cgit v1.2.3


From bc9552900339526b241cfd6ee4fb90a498868fd6 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 30 Nov 2021 19:01:33 +0200
Subject: SL-16369 Remove Hardware Skinning setting

---
 .../xui/en/floater_preferences_graphics_advanced.xml     | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 4f355cce00..d1e167df64 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -660,20 +660,6 @@
        Low
   </text>
 
-  <check_box
-    control_name="RenderAvatarVP"
-    height="16"
-    initial_value="true"
-    label="Avatar Hardware skinning"
-    layout="topleft"
-    left="440"
-    name="AvatarVertexProgram"
-    top_delta="16"
-    width="280">
-    <check_box.commit_callback
-      function="Pref.RenderOptionUpdate" />
-  </check_box>
-
   <check_box
     control_name="RenderAvatarCloth"
     height="16"
@@ -885,7 +871,7 @@
       layout="topleft"
       left="13"
       name="horiz_border"
-      top_pad="5"
+      top_pad="21"
       top_delta="5"
       width="774"/>
   <button
-- 
cgit v1.2.3


From 9e38e5a187574279b46dc76d9d0fb2c7b2f816f6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Dec 2021 22:58:27 +0200
Subject: SL-16471 Removed unneeded MeshOpt generation method

---
 .../skins/default/xui/en/floater_model_preview.xml       | 16 ----------------
 1 file changed, 16 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 d08bc92e5d..f10cc61826 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -194,10 +194,6 @@
                  name="MeshOptCombine"
                  label="Generate Precise"
                  value="MeshOptCombine" />
-                <item
-                 name="MeshOpt"
-                 label="Generate per face"
-                 value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
                  label="Generate Sloppy"
@@ -335,10 +331,6 @@
                  name="MeshOptCombine"
                  label="Generate Precise"
                  value="MeshOptCombine" />
-                <item
-                 name="MeshOpt"
-                 label="Generate per face"
-                 value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
                  label="Generate Sloppy"
@@ -480,10 +472,6 @@
                  name="MeshOptCombine"
                  label="Generate Precise"
                  value="MeshOptCombine" />
-                <item
-                 name="MeshOpt"
-                 label="Generate per face"
-                 value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
                  label="Generate Sloppy"
@@ -625,10 +613,6 @@
                  name="MeshOptCombine"
                  label="Generate Precise"
                  value="MeshOptCombine" />
-                <item
-                 name="MeshOpt"
-                 label="Generate per face"
-                 value="MeshOpt" />
                 <item
                  name="MeshOptSloppy"
                  label="Generate Sloppy"
-- 
cgit v1.2.3


From 8843ea1745cb09ec16acb1b1f0ca9125fd49d16c Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Mon, 28 Mar 2022 13:15:19 -0600
Subject: SL-17000 improve error message for physics mesh import

---
 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 ca3e40465c..1bfa459310 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,7 @@
   <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_degenerate_triangles">The physics mesh contains degenerate triangles. Use Analyze/Simplify to resolve.</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>
-- 
cgit v1.2.3


From 3687b292001444519594c94399d6f9c44462d971 Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Wed, 30 Mar 2022 10:31:32 -0600
Subject: SL-17000 modify physics mesh dense/degenerate error msg

---
 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 1bfa459310..e499ddbc2f 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,7 @@
   <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 contains degenerate triangles. Use Analyze/Simplify to resolve.</string>
+  <string name="phys_status_degenerate_triangles">The physics mesh is too dense or contains degenerate triangles. Use Analyze/Simplify to resolve.</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>
-- 
cgit v1.2.3


From 904b16a0a7fddb1cd36de8a33d5475df93d9cabe Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 29 Sep 2020 23:39:00 +0300
Subject: SL-17124 switchContext and loadShaderFile crashes

- Do not try initializing shaders if requirements are not met or if window does not exist
- Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close()
- mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
---
 indra/newview/skins/default/xui/en/notifications.xml | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e1f6dde6ff..3add211247 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9634,18 +9634,6 @@ Do you wish to continue?
      yestext="OK"/>
   </notification>
 
-  <global name="UnsupportedShaderRequirements">
-You do not appear to meet the hardware requirements for [APP_NAME]. [APP_NAME] requires OpenGL 2.0 or later shader support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
-
-If you continue to have problems, please visit the [SUPPORT_SITE].
-  </global>
-
-  <global name="UnsupportedGLRequirements">
-You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
-
-If you continue to have problems, please visit the [SUPPORT_SITE].
-  </global>
-
   <global name="UnsupportedIntelDriver">
 The installed Intel graphics driver for [GPUNAME], version [VERSION], is significantly out of date and is known to cause excessive rates of program crashes. You are strongly advised to update to a current Intel driver
 
-- 
cgit v1.2.3


From 63095005578007345d9916ebc6855246cdb08c7c Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 5 May 2022 18:57:03 +0300
Subject: SL-17356 Viewer changes for Premium Plus support

---
 indra/newview/skins/default/xui/de/strings.xml | 2 +-
 indra/newview/skins/default/xui/en/strings.xml | 2 +-
 indra/newview/skins/default/xui/fr/strings.xml | 2 +-
 indra/newview/skins/default/xui/it/strings.xml | 2 +-
 indra/newview/skins/default/xui/ja/strings.xml | 2 +-
 indra/newview/skins/default/xui/ru/strings.xml | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index f021e03dc7..ba26f721fe 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -5101,7 +5101,7 @@ Bitte überprüfen Sie http://status.secondlifegrid.net, um herauszufinden, ob e
 	<string name="PremiumMembership">
 		Premium
 	</string>
-	<string name="Premium PlusMembership">
+	<string name="Premium_PlusMembership">
 		Premium Plus
 	</string>
 	<string name="DeleteItems">
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 866196a760..acb3a720b9 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3964,7 +3964,7 @@ Please check http://status.secondlifegrid.net to see if there is a known problem
   <!-- SL Membership -->
   <string name="BaseMembership">Base</string>
   <string name="PremiumMembership">Premium</string>
-  <string name="Premium PlusMembership">Premium Plus</string>
+  <string name="Premium_PlusMembership">Premium Plus</string>
   <string name="InternalMembership">Internal</string> <!-- No need to translate -->
 
   <string name="MembershipUpgradeText">Upgrade to Premium</string>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 9fde703d6c..f7545f08d2 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -5102,7 +5102,7 @@ Veuillez vous reporter à http://status.secondlifegrid.net afin de déterminer s
 	<string name="PremiumMembership">
 		Premium
 	</string>
-	<string name="Premium PlusMembership">
+	<string name="Premium_PlusMembership">
 		Premium Plus
 	</string>
 	<string name="DeleteItems">
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 3049828f46..7690e02692 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -5017,7 +5017,7 @@ Consulta la pagina http://status.secondlifegrid.net per determinare se il proble
 	<string name="PremiumMembership">
 		Premium
 	</string>
-	<string name="Premium PlusMembership">
+	<string name="Premium_PlusMembership">
 		Premium Plus
 	</string>
 	<string name="DeleteItems">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index dcd6e65d34..b4bc36a800 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -5100,7 +5100,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="PremiumMembership">
 		プレミアム
 	</string>
-	<string name="Premium PlusMembership">
+	<string name="Premium_PlusMembership">
 		プレミアムプラス
 	</string>
 	<string name="DeleteItems">
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 43a87b2b18..ee2dcfe9cc 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -5096,7 +5096,7 @@ support@secondlife.com.
 	<string name="PremiumMembership">
 		Премиум
 	</string>
-	<string name="Premium PlusMembership">
+	<string name="Premium_PlusMembership">
 		Премиум Плюс
 	</string>
 	<string name="DeleteItems">
-- 
cgit v1.2.3