From 00a04b87a9fae83fd42419a5b3ace632095405ef Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 27 Jun 2022 22:30:14 +0300
Subject: SL-17640 Fix name usage, fix "apply now"

This reverts commit 231c618a844cee26a3779b703c88d8807df872e6, instead color swatched get enabled 'apply now' in xml.
---
 .../newview/skins/default/xui/en/floater_material_editor.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 36315d3b04..df06896fa5 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -43,7 +43,7 @@
     Albedo:
   </text>
     <texture_picker
-             can_apply_immediately="false"
+             can_apply_immediately="true"
              default_image_name="Default"
              fallback_image="materials_ui_x_24.png"
              allow_no_texture="true"
@@ -81,7 +81,7 @@
     Tint
   </text>
   <color_swatch
-                    can_apply_immediately="false"
+                    can_apply_immediately="true"
                     follows="left|top"
                     height="40"
                     label_height="0"
@@ -198,7 +198,7 @@
     Metallic-Roughness:
   </text>
     <texture_picker
-             can_apply_immediately="false"
+             can_apply_immediately="true"
              default_image_name="Default"
              fallback_image="materials_ui_x_24.png"
              allow_no_texture="true"
@@ -299,7 +299,7 @@
       Emissive:
     </text>
     <texture_picker
-               can_apply_immediately="false"
+               can_apply_immediately="true"
                default_image_name="Default"
                fallback_image="materials_ui_x_24.png"
                allow_no_texture="true"
@@ -336,7 +336,7 @@
       Tint
     </text>
     <color_swatch
-                      can_apply_immediately="false"
+                      can_apply_immediately="true"
                       follows="left|top"
                       height="40"
                       label_height="0"
@@ -394,7 +394,7 @@
       Normal:
     </text>
     <texture_picker
-               can_apply_immediately="false"
+               can_apply_immediately="true"
                default_image_name="Default"
                fallback_image="materials_ui_x_24.png"
                allow_no_texture="true"
-- 
cgit v1.2.3