From 2f4120038429c6aff865f153f708ceefb60d67f4 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 28 May 2024 09:45:40 -0500
Subject: Remove tinygltf dependency from LL::GLTF (#1541)

* #1535 Image loading/saving support in boost::json driven GLTF parser
* #1536 GLB Support in boost::json drvien GLTF parser
---
 indra/newview/skins/default/xui/en/menu_viewer.xml |  8 --------
 .../newview/skins/default/xui/en/notifications.xml | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8c9561fe64..daf8dd4208 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2879,14 +2879,6 @@ function="World.EnvPreset"
           <menu_item_call.on_click
            function="Advanced.ClickGLTFSaveAs" />
         </menu_item_call>
-        <menu_item_call
-         label="Decompose..."
-         name="Decompose...">
-          <menu_item_call.on_enable
-             function="EnableGLTF"/>
-          <menu_item_call.on_click
-           function="Advanced.ClickGLTFDecompose" />
-        </menu_item_call>
         <menu_item_call
          label="Upload..."
          name="Upload...">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e3b9f744e9..1584de6880 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12470,6 +12470,28 @@ are wearing now.
       yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="GLTFLoadFailed"
+   type="alert">
+    Failed to load GLTF file.  See log for details.
+    <tag>fail</tag>
+    <usetemplate
+      name="okbutton"
+      yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GLTFSaveFailed"
+   type="alert">
+    Failed to save GLTF file.  See log for details.
+    <tag>fail</tag>
+    <usetemplate
+      name="okbutton"
+      yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="GLTFSaveSelection"
-- 
cgit v1.2.3