summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorSabrina Shanman <cosmic@lindenlab.com>2022-11-16 21:38:29 +0000
committerSabrina Shanman <cosmic@lindenlab.com>2022-11-16 21:38:29 +0000
commitd934a14b970739986d46ebf57d3389c492d5d32d (patch)
tree454ee8d5b2c70dca00e10d84f0c7a3bb84dff717 /indra/newview/skins/default
parentd2b8d5b3687efb20f2d74bc7100282a5f3e8693d (diff)
parent62aa0e807f9eb1eeb2db0296fc942bab2faa0e13 (diff)
Merged in SL-18632 (pull request #1199)
SL-18632: Implement editing GLTF material texture transforms in build floater
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_tools_texture.xml24
1 files changed, 17 insertions, 7 deletions
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..ba5a20dd22 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
@@ -953,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"