From fd76c195c83d4af7469cc41f59c3fdcb02716012 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 11 Nov 2022 15:53:45 -0800
Subject: SL-18632: Implement editing GLTF material texture transforms in build
 floater

---
 .../skins/default/xui/en/panel_tools_texture.xml   | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 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 91cd28d80a..06e2a6e98e 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -896,10 +896,12 @@
              follows="left|top"
              height="19"
              initial_value="1"
-             label="ScaleU"
+             label="Scale u"
              label_width="205"
              layout="topleft"
              left="10"
+             min_val="-100"
+             max_val="100"
              name="gltfTextureScaleU"
              top_delta="-115"
              width="265" />
@@ -907,10 +909,12 @@
              follows="left|top"
              height="19"
              initial_value="1"
-             label="ScaleV"
+             label="Scale v"
              label_width="205"
              layout="topleft"
              left="10"
+             min_val="-100"
+             max_val="100"
              name="gltfTextureScaleV"
              width="265" />
             <spinner
@@ -921,27 +925,33 @@
              label_width="205"
              layout="topleft"
              left="10"
+             min_val="-360"
+             max_val="360"
              name="gltfTextureRotation"
              width="265" />
             <spinner
              follows="left|top"
              height="19"
              initial_value="0"
-             label="TranslationU"
+             label="Offset u"
              label_width="205"
              layout="topleft"
              left="10"
-             name="gltfTextureTranslationU"
+             min_val="-999"
+             max_val="999"
+             name="gltfTextureOffsetU"
              width="265" />
             <spinner
              follows="left|top"
              height="19"
              initial_value="0"
-             label="TranslationV"
+             label="Offset v"
              label_width="205"
              layout="topleft"
              left="10"
-             name="gltfTextureTranslationV"
+             min_val="-999"
+             max_val="999"
+             name="gltfTextureOffsetV"
              width="265" />
             <!-- END PBR Material texture transform parameters -->
             <check_box
-- 
cgit v1.2.3


From 62aa0e807f9eb1eeb2db0296fc942bab2faa0e13 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 16 Nov 2022 12:04:16 -0800
Subject: SL-18632: Un-hide planar align options when editing GLTF textures in
 build floater

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

(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 06e2a6e98e..ba5a20dd22 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -963,7 +963,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="16"
+             top_delta="43"
              width="260" />
 			<button
              follows="left|top"
-- 
cgit v1.2.3


From d2b8d5b3687efb20f2d74bc7100282a5f3e8693d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 16 Nov 2022 23:37:48 +0200
Subject: SL-17699 Fixed drag and drop into material picker

---
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 18631c3ae7..47de3b7576 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -19,7 +19,15 @@
     </floater.string>
     <floater.string
      name="pick title">
-        Pick:
+Pick:
+    </floater.string>
+    <floater.string
+     name="pick_material">
+PICK: MATERIAL
+    </floater.string>
+    <floater.string
+     name="pick_texture">
+PICK: TEXTURE
     </floater.string>
 
     <view
-- 
cgit v1.2.3