From 0bc7fee11fe43281d5d3c97e95249f9c26af0eb1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 23 Jun 2022 19:51:11 +0300
Subject: SL-17640 Materials Upload UI #1

1. Allow 'none' textures
2. Disable 'apply now' buttons
3. Switch from loading dae files to just gltf glb
---
 .../default/xui/en/floater_material_editor.xml     | 40 ++++++++++++----------
 .../newview/skins/default/xui/en/notifications.xml |  8 +++++
 2 files changed, 30 insertions(+), 18 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 5d72e6f79d..8482795f6f 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -7,8 +7,16 @@
  layout="topleft"
  name="material editor"
  help_topic="material_editor"
- title="Material: [MATERIAL_NAME]"
+ title="[MATERIAL_NAME]"
  width="256">
+  <check_box
+          follows="left|top"
+          label="Double Sided"
+          left="14"
+          top="14"
+          name="double sided"
+          height="25"
+          width="120" />
   <panel
     border="true"
          follows="left|top"
@@ -18,7 +26,7 @@
          left="5"
          mouse_opaque="false"
          name="Texture"
-         top="20"
+         top_pad="5"
          >
   <text
              type="string"
@@ -31,10 +39,11 @@
              width="64">
     Albedo:
   </text>
-  <texture_picker
-             can_apply_immediately="true"
+    <texture_picker
+             can_apply_immediately="false"
              default_image_name="Default"
              fallback_image="materials_ui_x_24.png"
+             allow_no_texture="true"
              follows="left|top"
              top_pad="8"
              height="151"
@@ -55,7 +64,7 @@
     Tint
   </text>
   <color_swatch
-                    can_apply_immediately="true"
+                    can_apply_immediately="false"
                     follows="left|top"
                     height="40"
                     label_height="0"
@@ -170,10 +179,11 @@
              >
     Metallic-Roughness:
   </text>
-  <texture_picker
-             can_apply_immediately="true"
+    <texture_picker
+             can_apply_immediately="false"
              default_image_name="Default"
              fallback_image="materials_ui_x_24.png"
+             allow_no_texture="true"
              follows="left|top"
              width="128" 
              height="151"
@@ -256,9 +266,10 @@
       Emissive:
     </text>
     <texture_picker
-               can_apply_immediately="true"
+               can_apply_immediately="false"
                default_image_name="Default"
                fallback_image="materials_ui_x_24.png"
+               allow_no_texture="true"
                follows="left|top"
                top_pad="8"
                height="151"
@@ -278,7 +289,7 @@
       Tint
     </text>
     <color_swatch
-                      can_apply_immediately="true"
+                      can_apply_immediately="false"
                       follows="left|top"
                       height="40"
                       label_height="0"
@@ -334,9 +345,10 @@
       Normal:
     </text>
     <texture_picker
-               can_apply_immediately="true"
+               can_apply_immediately="false"
                default_image_name="Default"
                fallback_image="materials_ui_x_24.png"
+               allow_no_texture="true"
                follows="left|top"
                top_pad="8"
                height="151"
@@ -352,14 +364,6 @@
           height="25"
           width="120" />-->
   </panel>
-  <check_box
-          follows="left|top"
-          label="Double Sided"
-          left="5"
-          top_pad="5"
-          name="double sided"
-          height="25"
-          width="120" />
   <button
              follows="right|bottom"
              height="25"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 786cf32e7a..8670aa92f4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9025,6 +9025,14 @@ Unable to upload texture.
 [REASON]   
   <tag>fail</tag>  
   </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotUploadMaterial"
+   type="alertmodal">
+There was a problem uploading the file
+    <tag>fail</tag>
+  </notification>
   
   <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3