From 93fc63c999a649f31b239b3def5f45d82cb37224 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Wed, 1 May 2013 13:10:44 -0700
Subject: [PATCH] NORSPEC-51 Fix for Incorrect Texture icon used in build tool
when normal or specular map is not set to 'Use Texture'
---
indra/newview/skins/default/textures/textures.xml | 1 +
indra/newview/skins/default/xui/en/panel_tools_texture.xml | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index fcab966dee7..b0e4b71d215 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -743,6 +743,7 @@ with the same filename but different name
<texture name="default_land_picture.j2c" />
<texture name="default_profile_picture.j2c" />
<texture name="locked_image.j2c" />
+ <texture name="materials_ui_x_24.png" />
<texture name="Progress_1" file_name="icons/Progress_1.png" preload="true" />
<texture name="Progress_2" file_name="icons/Progress_2.png" preload="true" />
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 678b4f43cdc..88b163252a2 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -139,7 +139,7 @@
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
- fallback_image="locked_image.j2c"
+ fallback_image="materials_ui_x_24.png"
follows="left|top"
height="80"
label="Texture "
@@ -216,7 +216,7 @@
allow_no_texture="true"
can_apply_immediately="true"
default_image_name="Default"
- fallback_image="locked_image.j2c"
+ fallback_image="materials_ui_x_24.png"
follows="left|top"
height="80"
label="Texture "
@@ -327,7 +327,7 @@
allow_no_texture="true"
can_apply_immediately="true"
default_image_name="Default"
- fallback_image="locked_image.j2c"
+ fallback_image="materials_ui_x_24.png"
follows="left|top"
height="80"
label="Texture "
--
GitLab