summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_terrain_texture_transform.xml9
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml202
2 files changed, 132 insertions, 79 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain_texture_transform.xml b/indra/newview/skins/default/xui/en/panel_region_terrain_texture_transform.xml
index cbcbe418cd..9a90700056 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain_texture_transform.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain_texture_transform.xml
@@ -3,7 +3,6 @@
border="true"
follows="top|left"
height="460"
- help_topic="panel_region_terrain_tab"
label="Terrain"
layout="topleft"
left="0"
@@ -225,13 +224,12 @@
left="0"
name="terrain_tabs"
tab_position="top"
- tab_width="100"
+ tab_width="110"
tab_padding_right="3"
top_pad="0"
width="700">
<panel
border="true"
- class="panel_settings_terrain_elevation"
filename="panel_settings_terrain_elevation.xml"
label="Elevation"
layout="topleft"
@@ -240,7 +238,6 @@
name="terrain_elevation_panel" />
<panel
border="true"
- class="panel_settings_terrain_transform"
filename="panel_settings_terrain_transform.xml"
label="Transforms"
layout="topleft"
@@ -256,8 +253,8 @@
height="20"
label="Apply"
layout="topleft"
- left="353"
+ left="351"
name="apply_btn"
- top_delta="290"
+ top_delta="310"
width="100" />
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml b/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml
index 7052622813..0bf0d8cffc 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml
@@ -10,6 +10,62 @@
<text
type="string"
length="1"
+ halign="center"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="terrain0_label"
+ left="48"
+ top_delta="0"
+ width="62">
+ 1
+ </text>
+ <text
+ type="string"
+ length="1"
+ halign="center"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="terrain1_label"
+ left_delta="110"
+ top_delta="0"
+ width="62">
+ 2
+ </text>
+ <text
+ type="string"
+ length="1"
+ halign="center"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="terrain2_label"
+ left_delta="110"
+ top_delta="0"
+ width="62">
+ 3
+ </text>
+ <text
+ type="string"
+ length="1"
+ halign="center"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="terrain3_label"
+ left_delta="110"
+ top_delta="0"
+ width="62">
+ 4
+ </text>
+ <text
+ type="string"
+ length="1"
halign="left"
valign="center"
follows="left|top"
@@ -17,19 +73,10 @@
layout="topleft"
name="terrain0ScaleU_label"
left="10"
- top_pad="3"
+ top_pad="0"
width="170">
Scale u
</text>
- <view_border
- bevel_style="none"
- follows="top|left"
- height="0"
- layout="topleft"
- left="8"
- top_pad="-2"
- name="terrain0ScaleU_horizontal"
- width="430" />
<spinner
follows="left|top"
height="19"
@@ -37,7 +84,7 @@
label="Scale u"
label_width="0"
layout="topleft"
- left="10"
+ left="46"
min_val="-100"
max_val="100"
name="terrain0ScaleU"
@@ -78,6 +125,15 @@
max_val="100"
name="terrain3ScaleU"
width="64" />
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="8"
+ top_pad="8"
+ name="terrainScaleU_horizontal"
+ width="432" />
<text
type="string"
length="1"
@@ -88,19 +144,10 @@
layout="topleft"
name="terrain0ScaleV_label"
left="10"
- top_pad="3"
+ top_pad="0"
width="170">
Scale v
</text>
- <view_border
- bevel_style="none"
- follows="top|left"
- height="0"
- layout="topleft"
- left="8"
- top_pad="-2"
- name="terrain0ScaleV_horizontal"
- width="430" />
<spinner
follows="left|top"
height="19"
@@ -108,7 +155,7 @@
label="Scale v"
label_width="0"
layout="topleft"
- left="10"
+ left="46"
min_val="-100"
max_val="100"
name="terrain0ScaleV"
@@ -149,6 +196,15 @@
max_val="100"
name="terrain3ScaleV"
width="64" />
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="8"
+ top_pad="8"
+ name="terrainScaleV_horizontal"
+ width="432" />
<text
type="string"
length="1"
@@ -159,19 +215,10 @@
layout="topleft"
name="terrain0Rotation_label"
left="10"
- top_pad="3"
+ top_pad="0"
width="170">
Rotation
</text>
- <view_border
- bevel_style="none"
- follows="top|left"
- height="0"
- layout="topleft"
- left="8"
- top_pad="-2"
- name="terrain0Rotation_horizontal"
- width="430" />
<spinner
follows="left|top"
height="19"
@@ -179,7 +226,7 @@
label="Rotation"
label_width="0"
layout="topleft"
- left="10"
+ left="46"
min_val="-360"
max_val="360"
name="terrain0Rotation"
@@ -192,8 +239,8 @@
label_width="0"
layout="topleft"
left_delta="110"
- min_val="-100"
- max_val="100"
+ min_val="-360"
+ max_val="360"
name="terrain1Rotation"
width="64" />
<spinner
@@ -204,8 +251,8 @@
label_width="0"
layout="topleft"
left_delta="110"
- min_val="-100"
- max_val="100"
+ min_val="-360"
+ max_val="360"
name="terrain2Rotation"
width="64" />
<spinner
@@ -216,10 +263,19 @@
label_width="0"
layout="topleft"
left_delta="110"
- min_val="-100"
- max_val="100"
+ min_val="-360"
+ max_val="360"
name="terrain3Rotation"
width="64" />
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="8"
+ top_pad="8"
+ name="terrainRotation_horizontal"
+ width="432" />
<text
type="string"
length="1"
@@ -230,19 +286,10 @@
layout="topleft"
name="terrain0OffsetU_label"
left="10"
- top_pad="3"
+ top_pad="0"
width="170">
Offset y
</text>
- <view_border
- bevel_style="none"
- follows="top|left"
- height="0"
- layout="topleft"
- left="8"
- top_pad="-2"
- name="terrain0OffsetU_horizontal"
- width="430" />
<spinner
follows="left|top"
height="19"
@@ -250,7 +297,7 @@
label="Offset u"
label_width="0"
layout="topleft"
- left="10"
+ left="46"
min_val="-999"
max_val="999"
name="terrain0OffsetU"
@@ -263,8 +310,8 @@
label_width="0"
layout="topleft"
left_delta="110"
- min_val="-100"
- max_val="100"
+ min_val="-999"
+ max_val="999"
name="terrain1OffsetU"
width="64" />
<spinner
@@ -275,8 +322,8 @@
label_width="0"
layout="topleft"
left_delta="110"
- min_val="-100"
- max_val="100"
+ min_val="-999"
+ max_val="999"
name="terrain2OffsetU"
width="64" />
<spinner
@@ -287,10 +334,19 @@
label_width="0"
layout="topleft"
left_delta="110"
- min_val="-100"
- max_val="100"
+ min_val="-999"
+ max_val="999"
name="terrain3OffsetU"
width="64" />
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="8"
+ top_pad="8"
+ name="terrainOffsetU_horizontal"
+ width="432" />
<text
type="string"
length="1"
@@ -301,19 +357,10 @@
layout="topleft"
name="terrain0OffsetV_label"
left="10"
- top_pad="3"
+ top_pad="0"
width="170">
Offset v
</text>
- <view_border
- bevel_style="none"
- follows="top|left"
- height="0"
- layout="topleft"
- left="8"
- top_pad="-2"
- name="terrain0OffsetV_horizontal"
- width="430" />
<spinner
follows="left|top"
height="19"
@@ -321,7 +368,7 @@
label="Offset v"
label_width="0"
layout="topleft"
- left="10"
+ left="46"
min_val="-999"
max_val="999"
name="terrain0OffsetV"
@@ -334,8 +381,8 @@
label_width="0"
layout="topleft"
left_delta="110"
- min_val="-100"
- max_val="100"
+ min_val="-999"
+ max_val="999"
name="terrain1OffsetV"
width="64" />
<spinner
@@ -346,8 +393,8 @@
label_width="0"
layout="topleft"
left_delta="110"
- min_val="-100"
- max_val="100"
+ min_val="-999"
+ max_val="999"
name="terrain2OffsetV"
width="64" />
<spinner
@@ -358,8 +405,17 @@
label_width="0"
layout="topleft"
left_delta="110"
- min_val="-100"
- max_val="100"
+ min_val="-999"
+ max_val="999"
name="terrain3OffsetV"
width="64" />
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="8"
+ top_pad="8"
+ name="terrainOffsetV_horizontal"
+ width="432" />
</panel>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-22 11:42:18 +0000