From 8a91c1394745a28cb78e7432eaa481b6cedd7408 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 22 Aug 2022 22:11:58 +0300
Subject: SL-17653 Local gltf materials #3

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index a1b614d1af..18c226ed58 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -242,7 +242,6 @@
      visible="false">
         <column name="icon" label="" width="20" />
         <column name="unit_name" label="Name" dynamicwidth="true" />
-        <column name="unit_id_HIDDEN" label="ID" width="0" />
     </scroll_list>
 
 <!-- middle: bake mode -->
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 24a934fbb8..c618c5bf32 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9802,6 +9802,15 @@ Attempted to add an invalid or unreadable image file [FNAME] which could not be
 Attempt cancelled.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="LocalGLTFVerifyFail"
+   persist="true"
+   type="notify">
+Attempted to add an invalid or unreadable GLTF material [FNAME] which could not be opened or decoded.
+Attempt cancelled.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="PathfindingReturnMultipleItems"
-- 
cgit v1.2.3