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

2 files changed, 22 insertions, 8 deletions

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
@@ -2880,14 +2880,6 @@ function="World.EnvPreset"
            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...">
           <menu_item_call.on_enable
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
@@ -12472,6 +12472,28 @@ are wearing now.
 
   <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"
    type="alert">
     You must select an object that has a GLTF asset associated with it.