diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-11-16 16:07:58 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-11-16 16:07:58 -0600 |
| commit | d5395502525ad3ebcfa2b75be23544d022b18dbc (patch) | |
| tree | 532311803cc838bcc234f0eaa0212d6281d4df0f /indra/newview/skins/default/xui | |
| parent | bc4694e82a5fa7aaafe77e9e3cb84f5b781e741a (diff) | |
| parent | 6387fbb378ff3ec5a8cf1e217eb4f2d71134c180 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 24 |
2 files changed, 26 insertions, 8 deletions
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 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" |