summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-10-10 18:44:03 +0100
committerGraham Linden <graham@lindenlab.com>2018-10-10 18:44:03 +0100
commit79d33f9d19a0c6e5ed34ffbd01a31cb2625e1ecc (patch)
treef0bbe587871419ecd36363c5c1d0def6e9166825 /indra/newview/skins
parent4b174a31c8db1bf7f378f9b088c1335651a34ec5 (diff)
Fix names of WATER_BLUR_MULTIPILER.
Give wave direction uniforms more meaningful names in shaders. Add comments on glow size/focus conversions for clarity.
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml46
1 files changed, 23 insertions, 23 deletions
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 1332ecd965..371ecd74bd 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
@@ -176,29 +176,6 @@
top_delta="15"
width="250"
can_edit_text="true"/>
- <text
- follows="left|top"
- height="10"
- layout="topleft"
- left_delta="-5"
- top_delta="22"
- width="200">
- Moon Brightness:
- </text>
- <slider
- decimal_digits="2"
- follows="left|top"
- height="16"
- increment="0.01"
- initial_value="0"
- layout="topleft"
- left_delta="5"
- min_val="0.0"
- max_val="1.0"
- name="moon_brightness"
- top_delta="15"
- width="250"
- can_edit_text="true"/>
</layout_panel>
<layout_panel
border="false"
@@ -287,6 +264,29 @@
top_delta="15"
width="130"
can_edit_text="true"/>
+ <text
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left_delta="-5"
+ top_delta="22"
+ width="200">
+ Brightness:
+ </text>
+ <slider
+ decimal_digits="2"
+ follows="left|top"
+ height="16"
+ increment="0.01"
+ initial_value="0"
+ layout="topleft"
+ left_delta="5"
+ min_val="0.0"
+ max_val="1.0"
+ name="moon_brightness"
+ top_delta="15"
+ width="250"
+ can_edit_text="true"/>
</layout_panel>
</layout_stack>
</layout_panel>