summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml30
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml40
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml15
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_water.xml151
5 files changed, 132 insertions, 108 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index fdd00ca910..b03a7037a6 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -440,7 +440,7 @@
height="450"
width="700"
min_height="0"
- visible="false">
+ visible="true">
<tab_container
follows="all"
halign="left"
@@ -470,7 +470,7 @@
height="450"
width="700"
min_height="0"
- visible="true">
+ visible="false">
<tab_container
follows="all"
halign="left"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 8317196e75..7a21d69ed4 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -113,7 +113,7 @@
<slider
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -122,7 +122,8 @@
max_val="1"
name="haze_horizon"
top_delta="20"
- width="200"/>
+ width="207"
+ can_edit_text="true"/>
<text
follows="left|top"
height="10"
@@ -135,7 +136,7 @@
<slider
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -144,7 +145,8 @@
max_val="1"
name="haze_density"
top_delta="20"
- width="200"/>
+ width="207"
+ can_edit_text="true"/>
<text
follows="left|top"
height="10"
@@ -157,7 +159,7 @@
<slider
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -165,7 +167,8 @@
max_val="10"
name="scene_gamma"
top_delta="20"
- width="207"/>
+ width="214"
+ can_edit_text="true"/>
</layout_panel>
<layout_panel
border="false"
@@ -186,7 +189,7 @@
<slider
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -195,7 +198,8 @@
max_val="0.9"
name="density_multip"
top_delta="20"
- width="200"/>
+ width="207"
+ can_edit_text="true"/>
<text
follows="left|top"
height="10"
@@ -208,7 +212,7 @@
<slider
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -217,7 +221,8 @@
max_val="100"
name="distance_multip"
top_delta="20"
- width="214"/>
+ width="219"
+ can_edit_text="true"/>
<text
follows="left|top"
height="10"
@@ -230,7 +235,7 @@
<slider
decimal_digits="1"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -239,7 +244,8 @@
max_val="4000"
name="max_alt"
top_delta="20"
- width="214"/>
+ width="219"
+ can_edit_text="true"/>
</layout_panel>
</layout_stack>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 57658a4725..b4c3089942 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -54,7 +54,7 @@
<slider
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -63,7 +63,8 @@
max_val="1"
name="cloud_coverage"
top_delta="20"
- width="214"/>
+ width="214"
+ can_edit_text="true"/>
<text
follows="left|top"
height="10"
@@ -76,7 +77,7 @@
<slider
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -85,7 +86,8 @@
max_val="1"
name="cloud_scale"
top_delta="20"
- width="214"/>
+ width="214"
+ can_edit_text="true"/>
<text
follows="left|top"
height="10"
@@ -145,7 +147,7 @@
label="X"
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -154,12 +156,13 @@
max_val="1"
name="cloud_density_x"
top_delta="20"
- width="200"/>
+ width="200"
+ can_edit_text="true"/>
<slider
label="Y"
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -168,12 +171,13 @@
max_val="1"
name="cloud_density_y"
top_delta="20"
- width="200"/>
+ width="200"
+ can_edit_text="true"/>
<slider
label="D"
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -182,7 +186,8 @@
max_val="1"
name="cloud_density_d"
top_delta="20"
- width="200"/>
+ width="200"
+ can_edit_text="true"/>
<text
follows="left|top"
height="10"
@@ -196,7 +201,7 @@
label="X"
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -205,12 +210,13 @@
max_val="1"
name="cloud_detail_x"
top_delta="20"
- width="200"/>
+ width="200"
+ can_edit_text="true"/>
<slider
label="Y"
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -219,12 +225,13 @@
max_val="1"
name="cloud_detail_y"
top_delta="20"
- width="200"/>
+ width="200"
+ can_edit_text="true"/>
<slider
label="D"
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -233,7 +240,8 @@
max_val="1"
name="cloud_detail_d"
top_delta="20"
- width="200"/>
+ width="200"
+ can_edit_text="true"/>
</layout_panel>
</layout_stack>
</panel> \ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 9e5df59daf..1323ad6a17 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -53,7 +53,7 @@
<slider
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -62,7 +62,8 @@
max_val="0.5"
name="glow_focus"
top_delta="20"
- width="200"/>
+ width="200"
+ can_edit_text="true"/>
<text
follows="left|top"
height="10"
@@ -75,7 +76,7 @@
<slider
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -84,7 +85,8 @@
max_val="1.99"
name="glow_size"
top_delta="20"
- width="200"/>
+ width="200"
+ can_edit_text="true"/>
<text
follows="left|top"
height="10"
@@ -97,7 +99,7 @@
<slider
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
@@ -106,7 +108,8 @@
max_val="2"
name="star_brightness"
top_delta="20"
- width="200"/>
+ width="200"
+ can_edit_text="true"/>
</layout_panel>
<layout_panel
border="false"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 85d636d107..c24a2dbbb6 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -57,13 +57,13 @@
height="10"
top_delta="-15"
left_delta="80"
- width="200">
+ width="150">
Density Exponent:
</text>
<slider
decimal_digits="1"
follows="left|top|right"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="top"
@@ -71,18 +71,19 @@
max_val="10"
name="water_fog_density"
top_delta="5"
- width="200"/>
+ width="150"
+ can_edit_text="true"/>
<text
follows="left|top"
height="10"
top_delta="25"
left_delta="-15"
- width="200">
+ width="150">
Underwater Modifier:</text>
<slider
decimal_digits="1"
follows="left|top|right"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="top"
@@ -90,7 +91,52 @@
max_val="10"
name="water_underwater_mod"
top_delta="20"
- width="200"/>
+ width="150"
+ can_edit_text="true"/>
+
+ <text
+ follows="left|top|right"
+ height="10"
+ layout="topleft"
+ left_delta="165"
+ top_delta="-53"
+ width="150">
+ Fresnel Scale:
+ </text>
+ <slider
+ decimal_digits="2"
+ follows="left|top"
+ height="16"
+ increment="0.01"
+ initial_value="0.7"
+ layout="topleft"
+ left_delta="5"
+ name="water_fresnel_scale"
+ top_delta="15"
+ width="150"
+ can_edit_text="true"/>
+ <text
+ follows="left|top|right"
+ layout="topleft"
+ left_delta="-5"
+ name="FresnelOffsetText"
+ top_delta="25"
+ width="150">
+ Fresnel Offset:
+ </text>
+ <slider
+ decimal_digits="2"
+ follows="left|top|right"
+ increment="0.01"
+ initial_value="0.7"
+ height="16"
+ layout="topleft"
+ left_delta="5"
+ name="water_fresnel_offset"
+ top_pad="5"
+ width="150"
+ can_edit_text="true"/>
+
</layout_panel>
<layout_panel
auto_resize="true"
@@ -112,38 +158,28 @@
min_width="460"
width="50">
<text
- follows="left|top"
- height="20"
- font="SansSerif"
- layout="topleft"
- left="5"
- top="5"
- width="215">
- Waves:
- </text>
- <text
follows="left|top|right"
height="16"
layout="topleft"
left="15"
- top_delta="20"
+ top="5"
width="215">
Normal Map
</text>
<texture_picker
- height="100"
+ height="75"
layout="topleft"
left_delta="0"
name="water_normal_map"
top_pad="5"
- width="100"/>
+ width="75"/>
<text
follows="left|top"
height="16"
layout="topleft"
top_delta="-20"
- left_delta="130">
+ left_delta="175">
Large Wave Speed
</text>
<xy_vector
@@ -167,7 +203,7 @@
height="16"
layout="topleft"
top_delta="-20"
- left_delta="160">
+ left_delta="140">
Small Wave Speed
</text>
<xy_vector
@@ -188,8 +224,8 @@
follows="left|top|right"
height="16"
layout="topleft"
- left="15"
- top_pad="10"
+ left="10"
+ top="90"
width="215">
Reflection Wavelet Scale
</text>
@@ -197,6 +233,7 @@
decimal_digits="1"
follows="left|top"
increment="0.01"
+ height="16"
initial_value="0.7"
layout="topleft"
label="X:"
@@ -204,69 +241,35 @@
max_val="10"
name="water_normal_scale_x"
top_pad="5"
- width="150"/>
+ width="150"
+ can_edit_text="true"/>
<slider
decimal_digits="1"
follows="left|top"
increment="0.01"
initial_value="0.7"
+ height="16"
layout="topleft"
max_val="10"
name="water_normal_scale_y"
top_pad="6"
label="Y:"
- width="150"/>
+ width="150"
+ can_edit_text="true"/>
<slider
decimal_digits="1"
follows="left|top"
increment="0.01"
initial_value="0.7"
+ height="16"
layout="topleft"
max_val="10"
name="water_normal_scale_z"
top_pad="6"
label="Z:"
- width="150"/>
-
- <text
- follows="left|top|right"
- height="16"
- layout="topleft"
- left_delta="175"
- top_delta="-52"
- width="150">
- Fresnel Scale:
- </text>
- <slider
- decimal_digits="2"
- follows="left|top"
- height="10"
- increment="0.01"
- initial_value="0.7"
- layout="topleft"
- left_delta="5"
- name="water_fresnel_scale"
- top_pad="5"
- width="150"/>
- <text
- follows="left|top|right"
- layout="topleft"
- left_delta="-5"
- name="FresnelOffsetText"
- top_pad="10"
- width="150">
- Fresnel Offset:
- </text>
- <slider
- decimal_digits="2"
- follows="left|top|right"
- increment="0.01"
- initial_value="0.7"
- layout="topleft"
- left_delta="5"
- name="water_fresnel_offset"
- top_pad="5"
- width="150"/>
+ width="150"
+ can_edit_text="true"/>
+
</layout_panel>
<layout_panel
border="true"
@@ -300,11 +303,13 @@
follows="left|top"
increment="0.01"
initial_value="0.1"
+ height="16"
layout="topleft"
left_delta="5"
name="water_scale_above"
top_pad="5"
- width="200" />
+ width="200"
+ can_edit_text="true" />
<text
type="string"
length="1"
@@ -312,7 +317,7 @@
height="16"
layout="topleft"
left_delta="-5"
- top_pad="15"
+ top_pad="5"
width="215">
Refraction Scale (Below)
</text>
@@ -320,14 +325,15 @@
control_name="water_scale_below"
decimal_digits="2"
follows="left|top"
- height="10"
+ height="16"
increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
name="water_scale_below"
top_pad="5"
- width="200"/>
+ width="200"
+ can_edit_text="true"/>
<text
follows="left|top|right"
font="SansSerif"
@@ -341,7 +347,7 @@
<slider
control_name="water_blur_multip"
follows="left|top"
- height="10"
+ height="16"
increment="0.001"
initial_value="0"
layout="topleft"
@@ -349,7 +355,8 @@
max_val="0.16"
name="water_blur_multip"
top_pad="5"
- width="200"/>
+ width="200"
+ can_edit_text="true"/>
</layout_panel>
</layout_stack>
</layout_panel>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 03:16:58 +0000