From 93fc63c999a649f31b239b3def5f45d82cb37224 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Wed, 1 May 2013 13:10:44 -0700
Subject: 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/xui/en/panel_tools_texture.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui')

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 678b4f43cd..88b163252a 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       "
-- 
cgit v1.2.3


From 29246e8a1fa1f8ebec307cc32017910d1e4ab5f4 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Tue, 7 May 2013 12:27:03 -0700
Subject: NORSPEC-165 tweak panel_tools_texture layout to uncrop the planar
 align checkbox

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

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 88b163252a..a5425062ec 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -2,7 +2,7 @@
 <panel
          border="false"
          follows="all"
-         height="400"
+         height="420"
          label="Texture"
          layout="topleft"
          left="0"
@@ -743,7 +743,7 @@
              left="7"
              name="checkbox planar align"
              tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
-             top_delta="26"
+             top_delta="16"
              width="260" />
             <web_browser
              visible="false"
-- 
cgit v1.2.3