From 7691780825940364e3faa7a682490f51491d44dc Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 25 May 2017 11:11:02 +0100
Subject: SL-694 - Added extra param field for flags related to extended mesh
 functionality. Currently this is just one bit to flag an object as able to
 animate

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index ed3cc26851..63e2ed4bb9 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2,7 +2,7 @@
 <floater
  positioning="cascading"
  legacy_header_height="18"
- height="590"
+ height="600"
  layout="topleft"
  bg_opaque_image="Window_NoTitle_Foreground"
  bg_alpha_image="Window_NoTitle_Background"
@@ -2131,7 +2131,7 @@ even though the user gets a free copy.
         <panel
          border="false"
          follows="all"
-         height="367"
+         height="387"
          label="Features"
          layout="topleft"
          left_delta="0"
@@ -2169,13 +2169,23 @@ even though the user gets a free copy.
                 Edit object features:
             </text>
             <check_box
-             height="19"
+             height="15"
+             label="Animated Mesh"
+             layout="topleft"
+             left="10"
+             name="Animated Mesh Checkbox Ctrl"
+             tool_tip="Allows rigged mesh objects to be animated independently"
+             top_pad="10"
+             width="121" />
+            <check_box
+             height="10"
              label="Flexible Path"
+             follows="left|top"
              layout="topleft"
              left="10"
              name="Flexible1D Checkbox Ctrl"
              tool_tip="Allows object to flex about the Z axis (Client-side only)"
-             top_pad="20"
+             top_pad="15"
              width="121" />
             <spinner
              follows="left|top"
-- 
cgit v1.2.3


From a57170724344842e26b8cd0fa4a47c24efa834c5 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 3 Aug 2017 14:23:02 +0100
Subject: SL-731 - render metadata includes triangle count, triangle and vertex
 count included with debug text for control avatar

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 697d27907d..f8b4948697 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2653,6 +2653,16 @@
            function="Advanced.ToggleInfoDisplay"
            parameter="lod info" />
         </menu_item_check>
+        <menu_item_check
+         label="Triangle Count"
+         name="Triangle Count">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="triangle count" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="triangle count" />
+        </menu_item_check>
         <menu_item_check
          label="Build Queue"
          name="Build Queue">
-- 
cgit v1.2.3


From a634d878098cff98b0622d492f5454a1bd41cff6 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 18 Sep 2017 21:16:22 +0100
Subject: SL-790 - Handle server notification about too many attached animated
 objects

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e21674a085..50013656ca 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10612,6 +10612,15 @@ Your access privileges don't allow you to duplicate objects here.
 You are not allowed to change this shape.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsTooManyAttachedAnimatedObjects"
+   type="notify">
+   <tag>fail</tag>
+Operation would cause the number of attached animated objects to exceed the limit.
+  </notification>
+
+
   <notification
    icon="alertmodal.tga"
    name="NoAccessToClaimObjects"
-- 
cgit v1.2.3


From a6068419e7fe1a5a0eda007b2e989769c0a92262 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 22 Sep 2017 18:04:03 +0100
Subject: SL-794, SL-790 - viewer-side enforcement in UI for various animated
 object limits that are also enforced on the server.

---
 .../newview/skins/default/xui/en/notifications.xml | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 50013656ca..0223d20f0f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10620,6 +10620,29 @@ You are not allowed to change this shape.
 Operation would cause the number of attached animated objects to exceed the limit.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsLinkAnimatedObjectTooLarge"
+   type="notify">
+   <tag>fail</tag>
+Can't link these objects because the resulting animated object would exceed the size limit.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsSetFlagAnimatedObjectTooLarge"
+   type="notify">
+   <tag>fail</tag>
+Can't make this object into an animated object because it would exceed the size limit.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ErrorNoMeshData"
+   type="notify">
+   <tag>fail</tag>
+Server error: cannot complete this operation because mesh data is not loaded.
+  </notification>
 
   <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From 6cdc6c236231a1f4b2ed545dc170dd52e6a9c31e Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 7 Dec 2017 16:18:32 +0000
Subject: SL-845 - viewer message for rez failure due to over-large animated
 objects

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f773ae6845..36efde1d54 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10490,6 +10490,14 @@ You have been teleported by the object '[OBJECT_NAME]' owned by an unknown user.
    type="notify">
    <tag>fail</tag>
 Unable to create requested object. The region is full.
+  </notification>
+
+   <notification
+    icon="alertmodal.tga"
+   name="CantCreateAnimatedObjectTooLarge"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested animated object because it exceeds the size limit.
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 9af10a84cf0671d04e844299456d4bc48d1dec45 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 2 Feb 2018 20:32:43 +0000
Subject: MAINT-8239 - problems with some instances failing to load some joint
 positions. Added DumpXML and Reset Skeleton support for animated objects when
 debugging.

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index dc9622a27d..91e7328979 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -214,4 +214,20 @@
     <menu_item_call.on_enable
      function="EnableMuteParticle" />
   </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
+    <menu_item_call
+		 label="Reset Skeleton"
+         name="Reset Skeleton">
+            <menu_item_call.on_click
+                function="Avatar.ResetSkeleton" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableResetSkeleton"/>
+    </menu_item_call>
 </context_menu>
-- 
cgit v1.2.3


From 3f9b3e01b9d7ea3a6662adb55027839840198b4c Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 21 Feb 2018 22:02:34 +0000
Subject: MAINT-8264 - prevent at least some cases of LODs getting stuck at
 too-low values.

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 91e7328979..ce34508303 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -228,6 +228,6 @@
             <menu_item_call.on_click
                 function="Avatar.ResetSkeleton" />
             <menu_item_call.on_visible
-             function="Advanced.EnableResetSkeleton"/>
+             function="Avatar.EnableResetSkeleton"/>
     </menu_item_call>
 </context_menu>
-- 
cgit v1.2.3


From 267e31717cc89c97fc077ae6ffef13e5ce59f18d Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 2 Apr 2018 21:57:31 +0100
Subject: SL-897 - notification wording fixes

---
 indra/newview/skins/default/xui/en/notifications.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 982d12d702..671a185fe2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10202,7 +10202,7 @@ Unable to create requested object. The region is full.
    name="CantCreateAnimatedObjectTooLarge"
    type="notify">
    <tag>fail</tag>
-Unable to create requested animated object because it exceeds the size limit.
+Unable to create requested animated object because it exceeds the rigged triangle limit.
   </notification>
 
   <notification
@@ -10346,7 +10346,7 @@ Operation would cause the number of attached animated objects to exceed the limi
    name="NoPermsLinkAnimatedObjectTooLarge"
    type="notify">
    <tag>fail</tag>
-Can't link these objects because the resulting animated object would exceed the size limit.
+Can't link these objects because the resulting animated object would exceed the rigged triangle limit.
   </notification>
 
   <notification
@@ -10354,7 +10354,15 @@ Can't link these objects because the resulting animated object would exceed the
    name="NoPermsSetFlagAnimatedObjectTooLarge"
    type="notify">
    <tag>fail</tag>
-Can't make this object into an animated object because it would exceed the size limit.
+Can't make this object into an animated object because it would exceed the rigged triangle limit.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantChangeAnimatedObjectStateInsufficientLand"
+   type="notify">
+   <tag>fail</tag>
+Can't change animated object state for this object because it would cause parcel limit to be exceeded.
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 791979c553a09963f03239cecc90083fe3f8c657 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 8 Aug 2018 13:34:02 +0100
Subject: SL-928 - in mesh upload, warn if bind shape is non-identity and skin
 weights are enabled.

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui')

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 2750316f2e..3db431de1b 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -14,6 +14,7 @@
 
   <string name="status_idle"></string>
   <string name="status_parse_error">Error: Dae parsing issue - see log for details.</string>
+  <string name="status_bind_shape_orientation">Warning: bind shape matrix is not in standard X-forward orientation.</string>
   <string name="status_material_mismatch">Error: Material of model is not a subset of reference model.</string>
   <string name="status_reading_file">Loading...</string>
   <string name="status_generating_meshes">Generating Meshes...</string>
-- 
cgit v1.2.3


From ae041779ccc83b1acc8a01528918d52aab9f565f Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 10 Oct 2018 14:37:49 +0100
Subject: SL-9849 - debug option for show impostor extents

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8490d792fa..42744b561f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3570,6 +3570,16 @@
                  function="Advanced.ToggleInfoDisplay"
                  parameter="agent target" />
             </menu_item_check>
+            <menu_item_check
+             label="Show Impostor Extents"
+             name="Show Impostor Extents">
+                <menu_item_check.on_check
+                 function="Advanced.CheckInfoDisplay"
+                 parameter="impostors" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleInfoDisplay"
+                 parameter="impostors" />
+            </menu_item_check>
             <!-- Appears not to exist anymore
             <menu_item_check
              label="Debug Rotation"
-- 
cgit v1.2.3