From b7e9f3ba4df02890700521f14614d5f5249cddf9 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 30 Nov 2022 15:13:25 -0800
Subject: SL-18746: Fix Align button ("Align current texture layers") being
 offset in build menu texture tab

---
 .../skins/default/xui/en/panel_tools_texture.xml   | 70 +++++++++++-----------
 1 file changed, 35 insertions(+), 35 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 ba5a20dd22..3bcbe0ca3a 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -891,6 +891,40 @@
              max_val="1"
              name="shinyOffsetV"
              width="265" />
+            <check_box
+             follows="top|left"
+             height="16"
+             initial_value="false"
+             label="Align planar faces"
+             layout="topleft"
+             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="20"
+             width="260" />
+			<button
+             follows="left|top"
+             layout="topleft"
+			 left="9"
+			 top="231"
+			 height="20"
+			 label="Align"
+			 label_selected="Align current texture layers"
+			 name="button align textures"
+			 tool_tip="Align current texture layers"
+			 width="66" />
+            <web_browser
+             visible="false"
+             enabled="false"
+             border_visible="true"
+             bottom_delta="0"
+             follows="top|left"
+             left="0"
+             name="title_media"
+             width="4"
+             height="4"
+             start_url="about:blank"
+             decouple_texture_size="true" />
             <!-- BEGIN PBR Material texture transform parameters -->
             <spinner
              follows="left|top"
@@ -903,7 +937,7 @@
              min_val="-100"
              max_val="100"
              name="gltfTextureScaleU"
-             top_delta="-115"
+             top_delta="34"
              width="265" />
             <spinner
              follows="left|top"
@@ -954,38 +988,4 @@
              name="gltfTextureOffsetV"
              width="265" />
             <!-- END PBR Material texture transform parameters -->
-            <check_box
-             follows="top|left"
-             height="16"
-             initial_value="false"
-             label="Align planar faces"
-             layout="topleft"
-             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="43"
-             width="260" />
-			<button
-             follows="left|top"
-             layout="topleft"
-			 left="9"
-			 top="231"
-			 height="20"
-			 label="Align"
-			 label_selected="Align current texture layers"
-			 name="button align textures"
-			 tool_tip="Align current texture layers"
-			 width="66" />
-            <web_browser
-             visible="false"
-             enabled="false"
-             border_visible="true"
-             bottom_delta="0"
-             follows="top|left"
-             left="0"
-             name="title_media"
-             width="4"
-             height="4"
-             start_url="about:blank"
-             decouple_texture_size="true" />
 </panel>
-- 
cgit v1.2.3


From c0f598c10376f12310660a729f4a763dbf46368e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 1 Dec 2022 06:42:10 +0200
Subject: SL-18725 Texture picker should explain why dropping texture isn't
 allowed

Show a tooltip on drag&drop
---
 indra/newview/skins/default/xui/en/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e7e1a24f5e..255aff06be 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -319,6 +319,11 @@ Only items with unrestricted
 'next owner' permissions
 can be attached to notecards.
 	</string>
+	<string name="TooltipTextureRestrictedDrop">
+Only textures with unrestricted
+copy and transfer permissions
+are allowed.
+	</string>
 
 	<!-- searching - generic -->
 	<string name="Searching">Searching...</string>
-- 
cgit v1.2.3