From 2fb337bc12984f9abecfbc7f3918c372a7b5ac6c Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Thu, 30 Sep 2010 23:21:23 -0400
Subject: STORM-1126 WIP Windlight Estate Settings port from 1.23: second pass
 at getting windlight ported to V2.

Lots of cleanup in the floater classes. Not sure every decision was correct
but it compiles now. Doesn't link yet.

(resubmitted by Vadim ProductEngine)
---
 .../default/xui/en/floater_day_cycle_options.xml   |  804 +++------
 .../skins/default/xui/en/floater_env_settings.xml  |  231 +--
 .../default/xui/en/floater_windlight_options.xml   | 1874 ++++++--------------
 3 files changed, 908 insertions(+), 2001 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
index 65e2462ef8..84812b9de6 100644
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
@@ -1,558 +1,250 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="275"
- layout="topleft"
- name="Day Cycle Floater"
- help_topic="day_cycle_floater"
- save_rect="true"
- title="DAY CYCLE EDITOR"
- width="658">
-    <tab_container
-     follows="left|top"
-     height="255"
-     layout="topleft"
-     left="0"
-     name="Day Cycle Tabs"
-     tab_position="top"
-     top="20"
-     width="656">
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="255"
-         label="Day Cycle"
-         layout="topleft"
-         left="1"
-         mouse_opaque="false"
-         name="Day Cycle"
-         top="0"
-         width="654">
-            <multi_slider
-             can_edit_text="true"
-             control_name="WLTimeSlider"
-             decimal_digits="0"
-             draw_track="false"
-             follows="bottom"
-             height="10"
-             increment="0.0833333"
-             initial_value="0"
-             layout="topleft"
-             left="20"
-             max_sliders="20"
-             max_val="24"
-             name="WLTimeSlider"
-             show_text="false"
-             top="25"
-             use_triangle="true"
-             width="525" />
-            <multi_slider
-             can_edit_text="true"
-             control_name="WLDayCycleKeys"
-             decimal_digits="0"
-             follows="bottom"
-             height="10"
-             increment="0.0833333"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             max_sliders="20"
-             max_val="24"
-             name="WLDayCycleKeys"
-             show_text="false"
-             top_pad="15"
-             width="525" />
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left="8"
-             name="WL12am"
-             top="74"
-             width="55">
-                12am
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL3am"
-             top_delta="0"
-             width="55">
-                3am
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL6am"
-             top_delta="0"
-             width="55">
-                6am
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL9amHash"
-             top_delta="0"
-             width="55">
-                9am
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL12pmHash"
-             top_delta="0"
-             width="55">
-                12pm
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL3pm"
-             top_delta="0"
-             width="55">
-                3pm
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL6pm"
-             top_delta="0"
-             width="55">
-                6pm
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL9pm"
-             top_delta="0"
-             width="55">
-                9pm
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL12am2"
-             top_delta="0"
-             width="55">
-                12am
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left="20"
-             name="WL12amHash"
-             top="54"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="11"
-             layout="topleft"
-             left_pad="59"
-             name="WL3amHash"
-             top_delta="3"
-             width="6">
-                I
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="59"
-             name="WL6amHash"
-             top_delta="-3"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="11"
-             layout="topleft"
-             left_pad="59"
-             name="WL9amHash2"
-             top_delta="3"
-             width="6">
-                I
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="59"
-             name="WL12pmHash2"
-             top_delta="-3"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="11"
-             layout="topleft"
-             left_pad="59"
-             name="WL3pmHash"
-             top_delta="3"
-             width="6">
-                I
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="59"
-             name="WL6pmHash"
-             top_delta="-3"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="11"
-             layout="topleft"
-             left_pad="59"
-             name="WL9pmHash"
-             top_delta="3"
-             width="6">
-                I
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="59"
-             name="WL12amHash2"
-             top_delta="-3"
-             width="6">
-                |
-            </text>
-            <button
-             height="20"
-             label="Add Key"
-             label_selected="Add Key"
-             layout="topleft"
-             left="555"
-             name="WLAddKey"
-             top="30"
-             width="96" />
-            <button
-             height="20"
-             label="Delete Key"
-             label_selected="Delete Key"
-             layout="topleft"
-             left_delta="0"
-             name="WLDeleteKey"
-             top_pad="5"
-             width="96" />
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="20"
-             name="WLCurKeyFrameText"
-             top="104"
-             width="235">
-                Key Frame Settings:
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="30"
-             name="WLCurKeyTimeText"
-             top="124"
-             width="105">
-                Key Time:
-            </text>
-            <spinner
-             control_name="WLCurKeyHour"
-             decimal_digits="0"
-             follows="left|top"
-             height="16"
-             increment="1"
-             initial_value="0"
-             label="Hour"
-             label_width="35"
-             layout="topleft"
-             left_delta="20"
-             max_val="100"
-             name="WLCurKeyHour"
-             top_pad="4"
-             width="74" />
-            <spinner
-             control_name="WLCurKeyMin"
-             decimal_digits="0"
-             follows="left|top"
-             height="16"
-             increment="5"
-             initial_value="0"
-             label="Min"
-             label_width="45"
-             layout="topleft"
-             left_pad="5"
-             max_val="55"
-             name="WLCurKeyMin"
-             top_delta="0"
-             width="85" />
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="30"
-             name="WLCurKeyTimeText2"
-             top="169"
-             width="185">
-                Key Preset:
-            </text>
-            <combo_box
-             height="18"
-             label="Preset"
-             layout="topleft"
-             left_delta="0"
-             name="WLKeyPresets"
-             top_pad="7"
-             width="205" />
-            <view_border
-             bevel_style="none"
-             follows="top|left"
-             height="115"
-             layout="topleft"
-             left="12"
-             top="101"
-             width="240" />
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_pad="15"
-             name="DayCycleText"
-             top="114"
-             width="120">
-                Snap:
-            </text>
-            <combo_box
-             enabled="false"
-             height="18"
-             label="5 min"
-             layout="topleft"
-             left_delta="0"
-             name="WLSnapOptions"
-             top_pad="7"
-             width="70" />
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="DayCycleText2"
-             top_pad="17"
-             width="120">
-                Length of Cycle:
-            </text>
-            <spinner
-             control_name="WLLengthOfDayHour"
-             decimal_digits="0"
-             follows="left|top"
-             height="16"
-             increment="1"
-             initial_value="0"
-             label="Hour"
-             label_width="33"
-             layout="topleft"
-             left_delta="-3"
-             max_val="100"
-             name="WLLengthOfDayHour"
-             top_pad="4"
-             width="74" />
-            <spinner
-             control_name="WLLengthOfDayMin"
-             decimal_digits="0"
-             follows="left|top"
-             height="16"
-             increment="1"
-             initial_value="0"
-             label="Min"
-             label_width="25"
-             layout="topleft"
-             left_pad="2"
-             max_val="59"
-             name="WLLengthOfDayMin"
-             top_delta="0"
-             width="65" />
-            <spinner
-             control_name="WLLengthOfDaySec"
-             decimal_digits="0"
-             follows="left|top"
-             height="16"
-             increment="1"
-             initial_value="24"
-             label="Sec"
-             label_width="25"
-             layout="topleft"
-             left_pad="2"
-             max_val="59"
-             name="WLLengthOfDaySec"
-             top_delta="0"
-             width="65"/>
-            <text
-             type="string"
-             halign="right"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-23"
-             name="DayCycleText3"
-             top="114"
-             width="85">
-                Preview :
-            </text>
-            <button
-             height="20"
-             label="Play"
-             label_selected="Play"
-             layout="topleft"
-             left="480"
-             name="WLAnimSky"
-             top_pad="5"
-             width="83" />
-            <button
-             height="20"
-             label="Stop!"
-             label_selected="Stop"
-             layout="topleft"
-             left_pad="4"
-             name="WLStopAnimSky"
-             top_delta="0"
-             width="83" />
-            <button
-             height="20"
-             label="Use Estate Time"
-             label_selected="Go to Estate Time"
-             layout="topleft"
-             left="480"
-             name="WLUseLindenTime"
-             top_pad="9"
-             width="170" />
-            <button
-             height="20"
-             label="Save Test Day"
-             label_selected="Save Test Day"
-             layout="topleft"
-             left_delta="0"
-             name="WLSaveDayCycle"
-             top_pad="9"
-             width="170" />
-            <button
-             height="20"
-             label="Load Test Day"
-             label_selected="Load Test Day"
-             layout="topleft"
-             left_delta="0"
-             name="WLLoadDayCycle"
-             top_pad="3"
-             width="170" />
-        </panel>
-    </tab_container>
+<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="275" left="50" min_height="180"
+     min_width="400" mouse_opaque="true" name="Day Cycle Floater"
+     rect_control="FloaterDayCycleRect" title="Day Cycle Editor" width="646">
+	<tab_container bottom="-275" follows="left|top" height="255" left="0"
+	     mouse_opaque="false" name="Day Cycle Tabs" tab_position="top" width="644">
+		<panel border="true" bottom="-255" follows="left|top|right|bottom" height="255"
+		     label="Day Cycle" left="1" mouse_opaque="false"
+		     name="Day Cycle" width="642">
+			<button bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="15"
+			     label="?" left="612" name="WLDayCycleHelp" width="18" />
+			<multi_slider allow_overlap="false" bottom="-35" can_edit_text="true"
+			     control_name="WLTimeSlider" decimal_digits="0" draw_track="false"
+			     follows="bottom" height="10" increment="0.08333333333" initial_val="0"
+			     label="" left="20" max_sliders="20" max_val="24" min_val="0"
+			     mouse_opaque="true" name="WLTimeSlider" show_text="false"
+			     use_triangle="true" value="0" width="525" />
+			<multi_slider allow_overlap="false" bottom="-60" can_edit_text="true"
+			     control_name="WLDayCycleKeys" decimal_digits="0" follows="bottom"
+			     height="10" increment="0.08333333333" initial_val="0" label="" left="20"
+			     max_sliders="20" max_val="24" min_val="0" mouse_opaque="true"
+			     name="WLDayCycleKeys" show_text="false" value="0" width="525" />
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-80" control_name="WL12am" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" left="8" mouse_opaque="true" name="WL12am"
+			     v_pad="0" width="55">
+				12am
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL3am" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" left_delta="65" mouse_opaque="true" name="WL3am"
+			     v_pad="0" width="55">
+				3am
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL6am" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" left_delta="65" mouse_opaque="true" name="WL6am"
+			     v_pad="0" width="55">
+				6am
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL9am" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" left_delta="65" mouse_opaque="true"
+			     name="WL9amHash" v_pad="0" width="55">
+				9am
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL12pm" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" left_delta="65" mouse_opaque="true"
+			     name="WL12pmHash" v_pad="0" width="55">
+				12pm
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL3pm" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" left_delta="65" mouse_opaque="true" name="WL3pm"
+			     v_pad="0" width="55">
+				3pm
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL6pm" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" left_delta="65" mouse_opaque="true" name="WL6pm"
+			     v_pad="0" width="55">
+				6pm
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL9pm" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" left_delta="65" mouse_opaque="true" name="WL9pm"
+			     v_pad="0" width="55">
+				9pm
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL12am2" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
+			     height="6" left_delta="65" mouse_opaque="true"
+			     name="WL12am2" v_pad="0" width="55">
+				12am
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-68" control_name="WL12amHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="14" left="20" mouse_opaque="true" name="WL12amHash"
+			     v_pad="0" width="4">
+				|
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL3amHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="11" left_delta="65" mouse_opaque="true"
+			     name="WL3amHash" v_pad="0" width="4">
+				I
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL6amHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="14" left_delta="65" mouse_opaque="true"
+			     name="WL6amHash" v_pad="0" width="4">
+				|
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL9amHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="11" left_delta="65" mouse_opaque="true"
+			     name="WL9amHash2" v_pad="0" width="4">
+				I
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL12pmHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="14" left_delta="65" mouse_opaque="true"
+			     name="WL12pmHash2" v_pad="0" width="4">
+				|
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL3pmHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="11" left_delta="65" mouse_opaque="true"
+			     name="WL3pmHash" v_pad="0" width="4">
+				I
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL6pmHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="14" left_delta="65" mouse_opaque="true"
+			     name="WL6pmHash" v_pad="0" width="4">
+				|
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL9pmHash" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="11" left_delta="65" mouse_opaque="true"
+			     name="WL9pmHash" v_pad="0" width="4">
+				I
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="0" control_name="WL12amHash2" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="14" left_delta="65" mouse_opaque="true"
+			     name="WL12amHash2" v_pad="0" width="4">
+				|
+			</text>
+			<button bottom="-40" enabled="true" font="SansSerif" halign="center" height="20"
+			     label="Add Key" label_selected="Add Key" left="550"
+			     mouse_opaque="true" name="WLAddKey" scale_image="true" width="80" />
+			<button bottom="-65" enabled="true" font="SansSerif" halign="center" height="20"
+			     label="Delete Key" label_selected="Delete Key" left="550"
+			     mouse_opaque="true" name="WLDeleteKey" scale_image="true" width="80" />
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-120" control_name="DayCycleText" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="16" left="20" mouse_opaque="true"
+			     name="WLCurKeyFrameText" v_pad="0" width="150">
+				Key Frame Settings:
+			</text>
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-140" control_name="DayCycleText" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="16" left="30" mouse_opaque="true"
+			     name="WLCurKeyTimeText" v_pad="0" width="100">
+				Key Time:
+			</text>
+			<spinner bottom_delta="-20" can_edit_text="true" control_name="WLCurKeyHour"
+			     decimal_digits="0" enabled="true" follows="left|top" height="16"
+			     increment="1" initial_val="0" label="Hour" label_width="30" left_delta="0"
+			     max_val="100" min_val="0" mouse_opaque="true" name="WLCurKeyHour"
+			     width="70" />
+			<spinner bottom_delta="0" can_edit_text="true" control_name="WLCurKeyMin"
+			     decimal_digits="0" enabled="true" follows="left|top" height="16"
+			     increment="5" initial_val="0" label="Min" label_width="20" left_delta="75"
+			     max_val="55" min_val="0" mouse_opaque="true" name="WLCurKeyMin" width="60" />
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom_delta="-25" control_name="WLCurKeyTimeText"
+			     drop_shadow_visible="true" follows="left|top|right" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="30"
+			     mouse_opaque="true" name="WLCurKeyTimeText2" v_pad="0" width="120">
+				Key Preset:
+			</text>
+			<combo_box allow_text_entry="false" bottom_delta="-25" enabled="true" follows="left|top"
+			     height="18" label="Preset" left_delta="0" max_chars="20"
+			     mouse_opaque="true" name="WLKeyPresets" width="155" />
+			<view_border bevel_style="none" border_thickness="1" bottom_delta="-6" follows="top|left"
+			     height="115" left="12" width="190" />
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-130" control_name="DayCycleText" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="16" left="220" mouse_opaque="true"
+			     name="DayCycleText" v_pad="0" width="120">
+				Snap:
+			</text>
+			<combo_box allow_text_entry="false" bottom_delta="-25" enabled="false" follows="left|top"
+			     height="18" label="5 min" left_delta="0" max_chars="20" mouse_opaque="true"
+			     name="WLSnapOptions" width="70" />
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-180" control_name="DayCycleText" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="16" left="220" mouse_opaque="true"
+			     name="DayCycleText2" v_pad="0" width="120">
+				Length of Cycle:
+			</text>
+			<spinner bottom_delta="-20" can_edit_text="true" control_name="WLLengthOfDayHour"
+			     decimal_digits="0" enabled="true" follows="left|top" height="16"
+			     increment="1" initial_val="0" label="Hour" label_width="30" left_delta="0"
+			     max_val="100" min_val="0" mouse_opaque="true" name="WLLengthOfDayHour"
+			     width="70" />
+			<spinner bottom_delta="0" can_edit_text="true" control_name="WLLengthOfDayMin"
+			     decimal_digits="0" enabled="true" follows="left|top" height="16"
+			     increment="1" initial_val="0" label="Min" label_width="20" left_delta="75"
+			     max_val="59" min_val="0" mouse_opaque="true" name="WLLengthOfDayMin"
+			     width="60" />
+			<spinner bottom_delta="0" can_edit_text="true" control_name="WLLengthOfDaySec"
+			     decimal_digits="0" enabled="true" follows="left|top" height="16"
+			     increment="1" initial_val="24" label="Sec" label_width="20" left_delta="65"
+			     max_val="59" min_val="0" mouse_opaque="true" name="WLLengthOfDaySec"
+			     width="60" />
+			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
+			     bottom="-130" control_name="DayCycleText" drop_shadow_visible="true"
+			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
+			     height="16" left="310" mouse_opaque="true"
+			     name="DayCycleText3" v_pad="0" width="120">
+				Preview:
+			</text>
+			<button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
+			     label="Play" label_selected="Play" left="310"
+			     mouse_opaque="true" name="WLAnimSky" scale_image="true" width="50" />
+			<button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
+			     label="Stop!" label_selected="Stop" left_delta="55"
+			     mouse_opaque="true" name="WLStopAnimSky" scale_image="true" width="50" />
+			<button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
+			     label="Use Estate Time" label_selected="Go to Estate Time"
+			     left_delta="55" mouse_opaque="true" name="WLUseLindenTime"
+			     scale_image="true" width="140" />
+			<button bottom="-195" enabled="true" font="SansSerif" halign="center" height="20"
+			     label="Save Test Day" label_selected="Save Test Day"
+			     left="480" mouse_opaque="true" name="WLSaveDayCycle" scale_image="true"
+			     width="150" />
+			<button bottom="-220" enabled="true" font="SansSerif" halign="center" height="20"
+			     label="Load Test Day" label_selected="Load Test Day"
+			     left="480" mouse_opaque="true" name="WLLoadDayCycle" scale_image="true"
+			     width="150" />
+		</panel>
+	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml
index 14f9e2db95..bd0a2ff330 100644
--- a/indra/newview/skins/default/xui/en/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml
@@ -1,163 +1,72 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="150"
- layout="topleft"
- name="Environment Editor Floater"
- help_topic="environment_editor_floater"
- save_rect="true"
- title="ENVIRONMENT EDITOR"
- width="600">
-    <floater.string
-     name="timeStr">
-        [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-    </floater.string>
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="EnvTimeText"
-     top="32"
-     width="140">
-        Time of Day
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left="15"
-     name="EnvTimeText2"
-     top="62"
-     width="140">
-        12:00 PM
-    </text>
-    <icon
-     height="25"
-     image_name="icon_diurnal.tga"
-     layout="topleft"
-     left="85"
-     name="EnvDayCycle"
-     top="30"
-     width="200" />
-    <slider
-     control_name="EnvTimeSlider"
-     decimal_digits="2"
-     follows="left"
-     height="10"
-     increment="0.0069444"
-     initial_value="0.7"
-     layout="topleft"
-     left_delta="0"
-     max_val="0.99"
-     name="EnvTimeSlider"
-     show_text="false"
-     top_pad="10"
-     width="200" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="EnvCloudText"
-     top="86"
-     width="140">
-        Cloud Cover
-    </text>
-    <slider
-     control_name="EnvCloudSlider"
-     decimal_digits="2"
-     follows="left"
-     height="10"
-     increment="0.01"
-     initial_value="0.7"
-     layout="topleft"
-     left_delta="75"
-     name="EnvCloudSlider"
-     top_delta="4"
-     width="210" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="310"
-     name="EnvWaterColorText"
-     top="39"
-     width="140">
-        Water Color
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     color="0.5 0.5 0.5 1"
-     follows="left|top"
-     height="50"
-     layout="topleft"
-     left="390"
-     name="EnvWaterColor"
-     tool_tip="Click to open color picker"
-     top="30"
-     width="40" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="310"
-     name="EnvWaterFogText"
-     top="86"
-     width="140">
-        Water Fog
-    </text>
-    <slider
-     control_name="EnvWaterFogSlider"
-     decimal_digits="2"
-     follows="left"
-     height="10"
-     initial_value="0"
-     layout="topleft"
-     left_delta="75"
-     max_val="10"
-     name="EnvWaterFogSlider"
-     top_delta="4"
-     width="210" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Use Estate Time"
-     layout="topleft"
-     left="10"
-     name="EnvUseEstateTimeButton"
-     top="120"
-     width="137" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Advanced Sky"
-     layout="topleft"
-     left_pad="3"
-     name="EnvAdvancedSkyButton"
-     top_delta="0"
-     width="137" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Advanced Water"
-     layout="topleft"
-     left_pad="3"
-     name="EnvAdvancedWaterButton"
-     top_delta="0"
-     width="137" />
+<floater bottom="-130" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="175" left="50" min_height="175"
+     min_width="600" mouse_opaque="true" name="Environment Editor Floater"
+     rect_control="FloaterEnvRect" title="Environment Editor" width="600">
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-48" drop_shadow_visible="true" follows="left|top|right"
+	     font="SansSerif" h_pad="0" halign="left" height="16" 
+	     left="10" mouse_opaque="true" name="EnvTimeText" v_pad="0" width="140">
+		Time of Day
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-30" drop_shadow_visible="true" follows="left|top|right"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" 
+	     left="15" mouse_opaque="true" name="EnvTimeText2" v_pad="0" width="140">
+		12:00 PM
+	</text>
+	<icon bottom="-55" follows="left|top" height="25" image_name="icon_diurnal.tga"
+	     left="85" name="EnvDayCycle" width="200" />
+	<slider bottom_delta="-20" can_edit_text="false" control_name="EnvTimeSlider"
+	     decimal_digits="2" follows="left" height="10" increment="0.0069444"
+	     initial_val="0.7" label="" left_delta="0" max_val="0.99" min_val="0"
+	     mouse_opaque="true" name="EnvTimeSlider" show_text="false" value="0.0"
+	     width="200" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-102" drop_shadow_visible="true" follows="left|top|right"
+	     font="SansSerif" h_pad="0" halign="left" height="16" 
+	     left="10" mouse_opaque="true" name="EnvCloudText" v_pad="0" width="140">
+		Cloud Cover
+	</text>
+	<slider bottom="-100" can_edit_text="false" control_name="EnvCloudSlider"
+	     decimal_digits="2" follows="left" height="10" increment="0.01"
+	     initial_val="0.7" label="" left="85" max_val="1" min_val="0"
+	     mouse_opaque="true" name="EnvCloudSlider" show_text="true" value="0.7"
+	     width="210" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-55" drop_shadow_visible="true" follows="left|top|right"
+	     font="SansSerif" h_pad="0" halign="left" height="16" 
+	     left="310" mouse_opaque="true" name="EnvWaterColorText" v_pad="0"
+	     width="140">
+		Water Color
+	</text>
+	<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
+	     can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
+	     height="50" label="" left="390" mouse_opaque="true"
+	     name="EnvWaterColor" tool_tip="Click to open Color Picker" width="40" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-102" drop_shadow_visible="true" follows="left|top|right"
+	     font="SansSerif" h_pad="0" halign="left" height="16" 
+	     left="310" mouse_opaque="true" name="EnvWaterFogText" v_pad="0" width="140">
+		Water Fog
+	</text>
+	<slider bottom="-100" can_edit_text="false" control_name="EnvWaterFogSlider"
+	     decimal_digits="2" follows="left" height="10" increment="0.1"
+	     initial_val="0" label="" left="385" max_val="10" min_val="0"
+	     mouse_opaque="true" name="EnvWaterFogSlider" show_text="true" value="0"
+	     width="210" />
+	<button bottom="-140" follows="left|top" font="SansSerifSmall" height="20"
+	     label="Use Estate Time" left="8" name="EnvUseEstateTimeButton" width="137" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
+	     label="Use Local Time" left_delta="147" name="EnvUseLocalTimeButton" width="137" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
+	     label="Advanced Sky" left_delta="147" name="EnvAdvancedSkyButton" width="137" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
+	     label="Advanced Water" left_delta="147" name="EnvAdvancedWaterButton" width="137" />
+	<check_box bottom_delta="-30" follows="left|top" left="8" name="RegionWLOptIn" label="Use Region Environment Settings"/>
+	<string name="region_environment_tooltip">
+		Check this box to use the region's environment settings.  Uncheck this box to set your own custom environment settings.  You cannot view the region's environment settings if this box is checked.
+	</string>
+	<button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?" left="570" name="EnvSettingsHelpButton"
+		width="18" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
index 85a5be369c..906e7de492 100644
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
@@ -1,1287 +1,593 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="256"
- layout="topleft"
- name="WindLight floater"
- help_topic="windlight_floater"
- save_rect="true"
- title="ADVANCED SKY EDITOR"
- width="700">
-    <floater.string
-     name="WLDefaultSkyNames">
-        A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-    </floater.string>
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="KeyFramePresetsText"
-     top="34"
-     width="85">
-        Sky Presets:
-    </text>
-    <combo_box
-     height="23"
-     layout="topleft"
-     left_delta="85"
-     name="WLPresetsCombo"
-     top_delta="-4"
-     width="150" />
-    <button
-     height="23"
-     label="New"
-     label_selected="New"
-     layout="topleft"
-     left_pad="3"
-     name="WLNewPreset"
-     width="70" />
-    <button
-     height="23"
-     label="Save"
-     label_selected="Save"
-     layout="topleft"
-     left_pad="3"
-     name="WLSavePreset"
-     width="70" />
-    <button
-     height="23"
-     label="Delete"
-     label_selected="Delete"
-     layout="topleft"
-     left_pad="3"
-     name="WLDeletePreset"
-     width="70" />
-    <button
-     height="23"
-     label="Day Cycle Editor"
-     label_selected="Day Cycle Editor"
-     layout="topleft"
-     right="-10"
-     name="WLDayCycleMenuButton"
-     top_pad="-23"
-     width="120" />
-    <tab_container
-     follows="left|top"
-     height="196"
-     halign="center"
-     layout="topleft"
-     left="0"
-     name="WindLight Tabs"
-     tab_position="top"
-     top="60"
+<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="220" left="50" min_height="180"
+     min_width="400" mouse_opaque="true" name="WindLight floater"
+     rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
      width="700">
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="196"
-         label="ATMOSPHERE"
-         layout="topleft"
-         left="1"
-         mouse_opaque="false"
-         help_topic="windlight_atmosphere_tab"
-         name="Atmosphere"
-         top="60"
-         width="698">
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="BHText"
-             top="4"
-             width="355">
-                Blue Horizon
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="BHText2"
-             top_pad="5"
-             width="10">
-                R
-            </text>
-            <slider
-             control_name="WLBlueHorizonR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLBlueHorizonR"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="10"
-             top_pad="-15"
-             name="BHText3"
-             width="10">
-                G
-            </text>
-            <slider
-             control_name="WLBlueHorizonG"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLBlueHorizonG"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             name="BHText4"
-             left="10"
-             top_pad="-15"
-             width="10">
-                B
-            </text>
-            <slider
-             control_name="WLBlueHorizonB"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             name="WLBlueHorizonB"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             name="BHText5"
-             left="10"
-             top_pad="-15"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLBlueHorizonI"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             name="WLBlueHorizonI"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="10"
-             top_pad="-10"
-             name="BDensText"
-             width="355">
-                Haze Horizon
-            </text>
-            <slider
-             control_name="WLHazeHorizon"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.25"
-             layout="topleft"
-             left="23"
-             top_delta="0"
-             top_pad="27"
-             name="WLHazeHorizon"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="BDensText2"
-             top="4"
-             width="355">
-                Blue Density
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="BHText6"
-             top_pad="5"
-             width="10">
-                R
-            </text>
-            <slider
-             control_name="WLBlueDensityR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLBlueDensityR"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="BHText7"
-             top_pad="-15"
-             width="10">
-                G
-            </text>
-            <slider
-             control_name="WLBlueDensityG"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLBlueDensityG"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="BHText8"
-             top_pad="-15"
-             width="10">
-                B
-            </text>
-            <slider
-             control_name="WLBlueDensityB"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLBlueDensityB"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="BHText9"
-             top_pad="-15"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLBlueDensityI"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1"
-             layout="topleft"
-             left_delta="0"
-             name="WLBlueDensityI"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="HDText"
-             top_pad="-10"
-             width="355">
-                Haze Density
-            </text>
-            <slider
-             control_name="WLHazeDensity"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left="258"
-             max_val="4"
-             name="WLHazeDensity"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="480"
-             name="DensMultText"
-             top="4"
-             width="355">
-                Density Multiplier
-            </text>
-            <slider
-             control_name="WLDensityMult"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.1"
-             layout="topleft"
-             left_delta="13"
-             max_val="0.9"
-             name="WLDensityMult"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="WLDistanceMultText"
-             top_pad="-10"
-             width="355">
-                Distance Multiplier
-            </text>
-            <slider
-             control_name="WLDistancMult"
-             decimal_digits="1"
-             follows="left"
-             height="10"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="13"
-             max_val="100"
-             name="WLDistanceMult"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="MaxAltText"
-             top_pad="-15"
-             width="355">
-                Max Altitude
-            </text>
-            <slider
-             control_name="WLMaxAltitude"
-             decimal_digits="0"
-             follows="left"
-             height="10"
-             increment="1"
-             initial_value="500"
-             layout="topleft"
-             left_delta="13"
-             max_val="4000"
-             name="WLMaxAltitude"
-             top_pad="27"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="196"
-         label="LIGHTING"
-         layout="topleft"
-         left_delta="0"
-         help_topic="windlight_lighting_tab"
-         name="Lighting"
-         top_delta="4"
-         width="698">
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="SLCText"
-             top="4"
-             width="355">
-                Sun/Moon Color
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText"
-             top_pad="5"
-             width="10">
-                R
-            </text>
-            <slider
-             control_name="WLSunlightR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLSunlightR"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText2"
-             top_pad="-15"
-             width="10">
-                G
-            </text>
-            <slider
-             control_name="WLSunlightG"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLSunlightG"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText3"
-             top_pad="-15"
-             width="10">
-                B
-            </text>
-            <slider
-             control_name="WLSunlightB"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLSunlightB"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText4"
-             top_pad="-15"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLSunlightI"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="0"
-             name="WLSunlightI"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="TODText"
-             top_pad="-10"
-             width="355">
-                Sun/Moon Position
-            </text>
-            <icon
-             height="20"
-             image_name="icon_diurnal.tga"
-             layout="topleft"
-             left_delta="14"
-             top_pad="10"
-             name="SkyDayCycle"
-             width="148" />
-            <slider
-             control_name="WLSunAngle"
-             follows="left"
-             height="10"
-             increment="0.001"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="-8"
-             name="WLSunAngle"
-             top_pad="20"
-             width="207" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="WLAmbientText"
-             top="4"
-             width="355">
-                Ambient
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText5"
-             top_pad="5"
-             width="10">
-                R
-            </text>
-            <slider
-             control_name="WLAmbientR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLAmbientR"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText6"
-             top_pad="-15"
-             width="10">
-                G
-            </text>
-            <slider
-             control_name="WLAmbientG"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLAmbientG"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText7"
-             top_pad="-15"
-             width="10">
-                B
-            </text>
-            <slider
-             control_name="WLAmbientB"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLAmbientB"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText8"
-             top_pad="-15"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLAmbientI"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1"
-             layout="topleft"
-             left_delta="0"
-             name="WLAmbientI"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="WLEastAngleText"
-             top_pad="-10"
-             width="355">
-                East Angle
-            </text>
-            <slider
-             control_name="WLEastAngle"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.0"
-             layout="topleft"
-             left_delta="13"
-             name="WLEastAngle"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="480"
-             name="SunGlowText"
-             top="4"
-             width="355">
-                Sun Glow
-            </text>
-            <slider
-             control_name="WLGlowB"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.1"
-             label="Focus "
-             layout="topleft"
-             left_delta="0"
-             max_val="0.5"
-             name="WLGlowB"
-             top_pad="27"
-             width="200" />
-            <slider
-             control_name="WLGlowR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.25"
-             label="Size    "
-             layout="topleft"
-             left_delta="0"
-             max_val="1.99"
-             min_val="1"
-             name="WLGlowR"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="SceneGammaText"
-             top_pad="-10"
-             width="200">
-                Scene Gamma
-            </text>
-            <slider
-             control_name="WLGamma"
-             decimal_digits="2"
-             follows="bottom"
-             height="10"
-             increment="0.01"
-             initial_value="2.0"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             name="WLGamma"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="WLStarText"
-             top_pad="-10"
-             width="355">
-                Star Brightness
-            </text>
-            <slider
-             control_name="WLStarAlpha"
-             decimal_digits="2"
-             follows="bottom"
-             height="10"
-             increment="0.01"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             max_val="2"
-             name="WLStarAlpha"
-             top_pad="27"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="196"
-         label="CLOUDS"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="windlight_clouds_tab"
-         name="Clouds"
-         top_delta="4"
-         width="698">
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="WLCloudColorText"
-             top="4"
-             width="355">
-                Cloud Color
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText"
-             top_pad="5"
-             width="10">
-                R
-            </text>
-            <slider
-             control_name="WLCloudColorR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLCloudColorR"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText2"
-             top_pad="-15"
-             width="10">
-                G
-            </text>
-            <slider
-             control_name="WLCloudColorG"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudColorG"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText3"
-             top_pad="-15"
-             width="10">
-                B
-            </text>
-            <slider
-             control_name="WLCloudColorB"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudColorB"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText4"
-             top_pad="-15"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLCloudColorI"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudColorI"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="WLCloudColorText2"
-             top_pad="-10"
-             width="355">
-                Cloud XY/Density
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText5"
-             top_pad="5"
-             width="10">
-                X
-            </text>
-            <slider
-             control_name="WLCloudX"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLCloudX"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText6"
-             top_pad="-15"
-             width="10">
-                Y
-            </text>
-            <slider
-             control_name="WLCloudY"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLCloudY"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText7"
-             top_pad="-15"
-             width="10">
-                D
-            </text>
-            <slider
-             control_name="WLCloudDensity"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudDensity"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="WLCloudCoverageText"
-             top="4"
-             width="355">
-                Cloud Coverage
-            </text>
-            <slider
-             control_name="WLCloudCoverage"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_delta="13"
-             name="WLCloudCoverage"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="WLCloudScaleText"
-             top_pad="-10"
-             width="355">
-                Cloud Scale
-            </text>
-            <slider
-             control_name="WLCloudScale"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="13"
-             min_val="0.01"
-             name="WLCloudScale"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="WLCloudDetailText"
-             top_pad="-10"
-             width="355">
-                Cloud Detail (XY/Density)
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText8"
-             top_pad="8"
-             width="10">
-                X
-            </text>
-            <slider
-             control_name="WLCloudDetailX"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_pad="3"
-             top_pad="8"
-             name="WLCloudDetailX"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText9"
-             top_pad="-15"
-             width="10">
-                Y
-            </text>
-            <slider
-             control_name="WLCloudDetailY"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudDetailY"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText10"
-             top_pad="-15"
-             width="10">
-                D
-            </text>
-            <slider
-             control_name="WLCloudDetailDensity"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudDetailDensity"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="480"
-             name="WLCloudScrollXText"
-             top="4"
-             width="355">
-                Cloud Scroll X
-            </text>
-            <check_box
-             control_name="WLCloudLockX"
-             follows="left"
-             height="16"
-             label="Lock"
-             layout="topleft"
-             left="625"
-             name="WLCloudLockX"
-             width="200" />
-            <slider
-             control_name="WLCloudScrollX"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left="494"
-             max_val="10"
-             min_val="-10"
-             name="WLCloudScrollX"
-             top="45"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-14"
-             name="WLCloudScrollYText"
-             top_delta="-1"
-             width="355">
-                Cloud Scroll Y
-            </text>
-            <check_box
-             control_name="WLCloudLockY"
-             follows="left"
-             height="16"
-             label="Lock"
-             layout="topleft"
-             left="625"
-             name="WLCloudLockY"
-             width="200" />
-            <slider
-             control_name="WLCloudScrollY"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left="494"
-             max_val="10"
-             min_val="-10"
-             name="WLCloudScrollY"
-             top="85"
-             width="200" />
-            <check_box
-             control_name="DrawClassicClouds"
-             follows="left"
-             height="16"
-             label="Draw Classic Clouds"
-             layout="topleft"
-             left="480"
-             name="DrawClassicClouds"
-             top="104"
-             width="200" />
-        </panel>
-    </tab_container>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-50" drop_shadow_visible="true" follows="left|top|right"
+	     font="SansSerif" h_pad="0" halign="left" height="16"
+	     left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
+	     width="110">
+		Sky Presets:
+	</text>
+	<combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
+	     left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
+	     width="150" />
+	<button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="New" label_selected="New" left_delta="170"
+	     mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Save" label_selected="Save" left_delta="80"
+	     mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Delete" label_selected="Delete" left_delta="80"
+	     mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Day Cycle Editor" label_selected="Day Cycle Editor"
+	     left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton"
+	     scale_image="true" width="120" />
+	<tab_container bottom="-220" follows="left|top" height="160" left="0"
+	     mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
+		<panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
+		     label="Atmosphere" left="1" mouse_opaque="false"
+		     name="Atmosphere" width="698">
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
+				Blue Horizon
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WLBlueHorizonHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
+				R
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
+				G
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
+				B
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
+				I
+			</text>
+			<slider bottom="-50" can_edit_text="false" control_name="WLBlueHorizonR"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueHorizonR" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonG"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueHorizonG" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonB"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueHorizonB" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonI"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueHorizonI" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
+				Haze Horizon
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WLHazeHorizonHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeHorizon"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.25" label="" left="24" max_val="1.0" min_val="0"
+			     mouse_opaque="true" name="WLHazeHorizon" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="BDensText2" v_pad="0" width="355">
+				Blue Density
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLBlueDensityHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="245" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
+				R
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
+				G
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
+				B
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
+				I
+			</text>
+			<slider bottom="-50" can_edit_text="false" control_name="WLBlueDensityR"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueDensityR" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityG"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueDensityG" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityB"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueDensityB" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityI"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueDensityI" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
+				Haze Density
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLHazeDensityHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeDensity"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="4" min_val="0"
+			     mouse_opaque="true" name="WLHazeDensity" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
+				Density Multiplier
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WLDensityMultHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLDensityMult"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.1" label="" left="494" max_val="0.9" min_val="0"
+			     mouse_opaque="true" name="WLDensityMult" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-53" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="WLDistanceMultText" v_pad="0"
+			     width="355">
+				Distance Multiplier
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WLDistanceMultHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLDistancMult"
+			     decimal_digits="1" follows="left" height="10" increment="0.1"
+			     initial_val="1.0" label="" left="494" max_val="100" min_val="0"
+			     mouse_opaque="true" name="WLDistanceMult" show_text="true" value="0.0"
+			     width="207" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
+				Max Altitude
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WLMaxAltitudeHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLMaxAltitude"
+			     decimal_digits="0" follows="left" height="10" increment="1"
+			     initial_val="500" label="" left="494" max_val="4000" min_val="0"
+			     mouse_opaque="true" name="WLMaxAltitude" show_text="true" value="4000"
+			     width="205" />
+		</panel>
+		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
+		     label="Lighting" left="1" mouse_opaque="true"
+		     name="Lighting" width="698">
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="SLCText" v_pad="0" width="355">
+				Sun/Moon Color
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WLSunlightColorHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
+				R
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
+				G
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
+				B
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
+				I
+			</text>
+			<slider bottom="-50" can_edit_text="false" control_name="WLSunlightR"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLSunlightR" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightG"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLSunlightG" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightB"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLSunlightB" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightI"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLSunlightI" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="TODText" v_pad="0" width="355">
+				Sun/Moon Position
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WLTimeOfDayHelp" width="18" />
+			<icon bottom_delta="-30" follows="left|top" height="20" image_name="icon_diurnal.tga"
+			     left="30" name="SkyDayCycle" width="148" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLSunAngle"
+			     decimal_digits="3" follows="left" height="10" increment="0.001"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLSunAngle" show_text="true" value="1.0"
+			     width="204" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="WLAmbientText" v_pad="0" width="355">
+				Ambient
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLAmbientHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="245" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
+				R
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
+				G
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
+				B
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
+				I
+			</text>
+			<slider bottom="-50" can_edit_text="false" control_name="WLAmbientR" decimal_digits="2"
+			     follows="left" height="10" increment="0.01" initial_val="0.7" label=""
+			     left="259" max_val="1" min_val="0" mouse_opaque="true" name="WLAmbientR"
+			     show_text="true" value="1.0" width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientG"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLAmbientG" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientB"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLAmbientB" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientI"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLAmbientI" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="WLEastAngleText" v_pad="0" width="355">
+				East Angle
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLEastAngleHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLEastAngle"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.0" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLEastAngle" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="SunGlowText" v_pad="0" width="355">
+				Sun Glow
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WLSunGlowHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLGlowB"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.1" label="Focus " left="494" max_val="0.5" min_val="0"
+			     mouse_opaque="true" name="WLGlowB" show_text="true" value="1.0" width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLGlowR"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.25" label="Size    " left="494" max_val="1.99" min_val="1"
+			     mouse_opaque="true" name="WLGlowR" show_text="true" value="1.0" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-67" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="SceneGammaText" v_pad="0" width="200">
+				Scene Gamma
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WLSceneGammaHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLGamma"
+			     decimal_digits="2" follows="bottom" height="10" increment="0.01"
+			     initial_val="2.0" label="" left="494" max_val="10.0" min_val="0"
+			     mouse_opaque="true" name="WLGamma" show_text="true" value="2.0" width="207" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-102" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="WLStarText" v_pad="0" width="355">
+				Star Brightness
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WLStarBrightnessHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLStarAlpha"
+			     decimal_digits="2" follows="bottom" height="10" increment="0.01"
+			     initial_val="0" label="" left="494" max_val="2" min_val="0"
+			     mouse_opaque="true" name="WLStarAlpha" show_text="true" value="0"
+			     width="200" />
+		</panel>
+		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
+		     label="Clouds" left="1" mouse_opaque="false" name="Clouds"
+		     width="698">
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="WLCloudColorText" v_pad="0" width="355">
+				Cloud Color
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WLCloudColorHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
+				R
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
+				G
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
+				B
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
+				I
+			</text>
+			<slider bottom="-50" can_edit_text="false" control_name="WLCloudColorR"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudColorR" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorG"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudColorG" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorB"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudColorB" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorI"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudColorI" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="WLCloudColorText2" v_pad="0"
+			     width="355">
+				Cloud XY/Density
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WLCloudDensityHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-103" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="10" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
+				X
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
+				Y
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
+				D
+			</text>
+			<slider bottom="-117" can_edit_text="false" control_name="WLCloudX" decimal_digits="2"
+			     follows="left" height="10" increment="0.01" initial_val="0.5" label=""
+			     left="24" max_val="1" min_val="0" mouse_opaque="true" name="WLCloudX"
+			     show_text="true" value="0.5" width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudY"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.5" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudY" show_text="true" value="0.5"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDensity"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudDensity" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="WLCloudCoverageText" v_pad="0"
+			     width="355">
+				Cloud Coverage
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLCloudCoverageHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudCoverage"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudCoverage" show_text="true" value="0.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-55" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="WLCloudScaleText" v_pad="0"
+			     width="355">
+				Cloud Scale
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLCloudScaleHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudScale"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="" left="259" max_val="1.0" min_val="0.01"
+			     mouse_opaque="true" name="WLCloudScale" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="WLCloudDetailText" v_pad="0"
+			     width="355">
+				Cloud Detail (XY/Density)
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLCloudDetailHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-103" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="245" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
+				X
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
+				Y
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText10" v_pad="0" width="10">
+				D
+			</text>
+			<slider bottom="-117" can_edit_text="false" control_name="WLCloudDetailX"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudDetailX" show_text="true" value="0.5"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailY"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudDetailY" show_text="true" value="0.5"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailDensity"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudDetailDensity" show_text="true"
+			     value="1.0" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="WLCloudScrollXText" v_pad="0"
+			     width="355">
+				Cloud Scroll X
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="605" name="WLCloudScrollXHelp" width="18" />
+			<check_box control_name="WLCloudLockX" follows="left" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Lock" left="625" mouse_opaque="true"
+			     name="WLCloudLockX" width="200" />
+			<slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollX"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
+			     mouse_opaque="true" name="WLCloudScrollX" show_text="true" value="0.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-60" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="WLCloudScrollYText" v_pad="0"
+			     width="355">
+				Cloud Scroll Y
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="605" name="WLCloudScrollYHelp" width="18" />
+			<check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Lock" left="625" mouse_opaque="true"
+			     name="WLCloudLockY" width="200" />
+			<slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollY"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
+			     mouse_opaque="true" name="WLCloudScrollY" show_text="true" value="0.0"
+			     width="200" />
+			<check_box bottom="-120" control_name="DrawClassicClouds" follows="left"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Draw Classic Clouds" left="480" mouse_opaque="true"
+			     name="DrawClassicClouds" width="200" />
+			<button bottom="-102" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="608" name="WLClassicCloudsHelp" width="18" />
+		</panel>
+	</tab_container>
+	<string name="WLDefaultSkyNames">
+		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
+	</string>
 </floater>
-- 
cgit v1.2.3


From 7aa3f87fdd3eba47867be28ad489b107a523110e Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 31 Mar 2011 18:24:01 +0300
Subject: STORM-1126 WIP Windlight Estate Settings integration: pass 1

Fixed Environment Editor, Advanced Sky and Day Cycle Editor floaters layout by reverting a bad merge from Viewer 1.23 codebase.
---
 .../default/xui/en/floater_day_cycle_options.xml   |  804 ++++++---
 .../skins/default/xui/en/floater_env_settings.xml  |  231 ++-
 .../default/xui/en/floater_windlight_options.xml   | 1874 ++++++++++++++------
 3 files changed, 2001 insertions(+), 908 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
index 84812b9de6..65e2462ef8 100644
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
@@ -1,250 +1,558 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="275" left="50" min_height="180"
-     min_width="400" mouse_opaque="true" name="Day Cycle Floater"
-     rect_control="FloaterDayCycleRect" title="Day Cycle Editor" width="646">
-	<tab_container bottom="-275" follows="left|top" height="255" left="0"
-	     mouse_opaque="false" name="Day Cycle Tabs" tab_position="top" width="644">
-		<panel border="true" bottom="-255" follows="left|top|right|bottom" height="255"
-		     label="Day Cycle" left="1" mouse_opaque="false"
-		     name="Day Cycle" width="642">
-			<button bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="15"
-			     label="?" left="612" name="WLDayCycleHelp" width="18" />
-			<multi_slider allow_overlap="false" bottom="-35" can_edit_text="true"
-			     control_name="WLTimeSlider" decimal_digits="0" draw_track="false"
-			     follows="bottom" height="10" increment="0.08333333333" initial_val="0"
-			     label="" left="20" max_sliders="20" max_val="24" min_val="0"
-			     mouse_opaque="true" name="WLTimeSlider" show_text="false"
-			     use_triangle="true" value="0" width="525" />
-			<multi_slider allow_overlap="false" bottom="-60" can_edit_text="true"
-			     control_name="WLDayCycleKeys" decimal_digits="0" follows="bottom"
-			     height="10" increment="0.08333333333" initial_val="0" label="" left="20"
-			     max_sliders="20" max_val="24" min_val="0" mouse_opaque="true"
-			     name="WLDayCycleKeys" show_text="false" value="0" width="525" />
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom="-80" control_name="WL12am" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-			     height="6" left="8" mouse_opaque="true" name="WL12am"
-			     v_pad="0" width="55">
-				12am
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL3am" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-			     height="6" left_delta="65" mouse_opaque="true" name="WL3am"
-			     v_pad="0" width="55">
-				3am
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL6am" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-			     height="6" left_delta="65" mouse_opaque="true" name="WL6am"
-			     v_pad="0" width="55">
-				6am
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL9am" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-			     height="6" left_delta="65" mouse_opaque="true"
-			     name="WL9amHash" v_pad="0" width="55">
-				9am
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL12pm" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-			     height="6" left_delta="65" mouse_opaque="true"
-			     name="WL12pmHash" v_pad="0" width="55">
-				12pm
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL3pm" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-			     height="6" left_delta="65" mouse_opaque="true" name="WL3pm"
-			     v_pad="0" width="55">
-				3pm
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL6pm" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-			     height="6" left_delta="65" mouse_opaque="true" name="WL6pm"
-			     v_pad="0" width="55">
-				6pm
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL9pm" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-			     height="6" left_delta="65" mouse_opaque="true" name="WL9pm"
-			     v_pad="0" width="55">
-				9pm
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL12am2" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-			     height="6" left_delta="65" mouse_opaque="true"
-			     name="WL12am2" v_pad="0" width="55">
-				12am
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom="-68" control_name="WL12amHash" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="14" left="20" mouse_opaque="true" name="WL12amHash"
-			     v_pad="0" width="4">
-				|
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL3amHash" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="11" left_delta="65" mouse_opaque="true"
-			     name="WL3amHash" v_pad="0" width="4">
-				I
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL6amHash" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="14" left_delta="65" mouse_opaque="true"
-			     name="WL6amHash" v_pad="0" width="4">
-				|
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL9amHash" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="11" left_delta="65" mouse_opaque="true"
-			     name="WL9amHash2" v_pad="0" width="4">
-				I
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL12pmHash" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="14" left_delta="65" mouse_opaque="true"
-			     name="WL12pmHash2" v_pad="0" width="4">
-				|
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL3pmHash" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="11" left_delta="65" mouse_opaque="true"
-			     name="WL3pmHash" v_pad="0" width="4">
-				I
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL6pmHash" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="14" left_delta="65" mouse_opaque="true"
-			     name="WL6pmHash" v_pad="0" width="4">
-				|
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL9pmHash" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="11" left_delta="65" mouse_opaque="true"
-			     name="WL9pmHash" v_pad="0" width="4">
-				I
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="0" control_name="WL12amHash2" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="14" left_delta="65" mouse_opaque="true"
-			     name="WL12amHash2" v_pad="0" width="4">
-				|
-			</text>
-			<button bottom="-40" enabled="true" font="SansSerif" halign="center" height="20"
-			     label="Add Key" label_selected="Add Key" left="550"
-			     mouse_opaque="true" name="WLAddKey" scale_image="true" width="80" />
-			<button bottom="-65" enabled="true" font="SansSerif" halign="center" height="20"
-			     label="Delete Key" label_selected="Delete Key" left="550"
-			     mouse_opaque="true" name="WLDeleteKey" scale_image="true" width="80" />
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom="-120" control_name="DayCycleText" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="16" left="20" mouse_opaque="true"
-			     name="WLCurKeyFrameText" v_pad="0" width="150">
-				Key Frame Settings:
-			</text>
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom="-140" control_name="DayCycleText" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="16" left="30" mouse_opaque="true"
-			     name="WLCurKeyTimeText" v_pad="0" width="100">
-				Key Time:
-			</text>
-			<spinner bottom_delta="-20" can_edit_text="true" control_name="WLCurKeyHour"
-			     decimal_digits="0" enabled="true" follows="left|top" height="16"
-			     increment="1" initial_val="0" label="Hour" label_width="30" left_delta="0"
-			     max_val="100" min_val="0" mouse_opaque="true" name="WLCurKeyHour"
-			     width="70" />
-			<spinner bottom_delta="0" can_edit_text="true" control_name="WLCurKeyMin"
-			     decimal_digits="0" enabled="true" follows="left|top" height="16"
-			     increment="5" initial_val="0" label="Min" label_width="20" left_delta="75"
-			     max_val="55" min_val="0" mouse_opaque="true" name="WLCurKeyMin" width="60" />
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom_delta="-25" control_name="WLCurKeyTimeText"
-			     drop_shadow_visible="true" follows="left|top|right" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="30"
-			     mouse_opaque="true" name="WLCurKeyTimeText2" v_pad="0" width="120">
-				Key Preset:
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-25" enabled="true" follows="left|top"
-			     height="18" label="Preset" left_delta="0" max_chars="20"
-			     mouse_opaque="true" name="WLKeyPresets" width="155" />
-			<view_border bevel_style="none" border_thickness="1" bottom_delta="-6" follows="top|left"
-			     height="115" left="12" width="190" />
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom="-130" control_name="DayCycleText" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="16" left="220" mouse_opaque="true"
-			     name="DayCycleText" v_pad="0" width="120">
-				Snap:
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-25" enabled="false" follows="left|top"
-			     height="18" label="5 min" left_delta="0" max_chars="20" mouse_opaque="true"
-			     name="WLSnapOptions" width="70" />
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom="-180" control_name="DayCycleText" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="16" left="220" mouse_opaque="true"
-			     name="DayCycleText2" v_pad="0" width="120">
-				Length of Cycle:
-			</text>
-			<spinner bottom_delta="-20" can_edit_text="true" control_name="WLLengthOfDayHour"
-			     decimal_digits="0" enabled="true" follows="left|top" height="16"
-			     increment="1" initial_val="0" label="Hour" label_width="30" left_delta="0"
-			     max_val="100" min_val="0" mouse_opaque="true" name="WLLengthOfDayHour"
-			     width="70" />
-			<spinner bottom_delta="0" can_edit_text="true" control_name="WLLengthOfDayMin"
-			     decimal_digits="0" enabled="true" follows="left|top" height="16"
-			     increment="1" initial_val="0" label="Min" label_width="20" left_delta="75"
-			     max_val="59" min_val="0" mouse_opaque="true" name="WLLengthOfDayMin"
-			     width="60" />
-			<spinner bottom_delta="0" can_edit_text="true" control_name="WLLengthOfDaySec"
-			     decimal_digits="0" enabled="true" follows="left|top" height="16"
-			     increment="1" initial_val="24" label="Sec" label_width="20" left_delta="65"
-			     max_val="59" min_val="0" mouse_opaque="true" name="WLLengthOfDaySec"
-			     width="60" />
-			<text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
-			     bottom="-130" control_name="DayCycleText" drop_shadow_visible="true"
-			     follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-			     height="16" left="310" mouse_opaque="true"
-			     name="DayCycleText3" v_pad="0" width="120">
-				Preview:
-			</text>
-			<button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
-			     label="Play" label_selected="Play" left="310"
-			     mouse_opaque="true" name="WLAnimSky" scale_image="true" width="50" />
-			<button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
-			     label="Stop!" label_selected="Stop" left_delta="55"
-			     mouse_opaque="true" name="WLStopAnimSky" scale_image="true" width="50" />
-			<button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
-			     label="Use Estate Time" label_selected="Go to Estate Time"
-			     left_delta="55" mouse_opaque="true" name="WLUseLindenTime"
-			     scale_image="true" width="140" />
-			<button bottom="-195" enabled="true" font="SansSerif" halign="center" height="20"
-			     label="Save Test Day" label_selected="Save Test Day"
-			     left="480" mouse_opaque="true" name="WLSaveDayCycle" scale_image="true"
-			     width="150" />
-			<button bottom="-220" enabled="true" font="SansSerif" halign="center" height="20"
-			     label="Load Test Day" label_selected="Load Test Day"
-			     left="480" mouse_opaque="true" name="WLLoadDayCycle" scale_image="true"
-			     width="150" />
-		</panel>
-	</tab_container>
+<floater
+ legacy_header_height="18"
+ height="275"
+ layout="topleft"
+ name="Day Cycle Floater"
+ help_topic="day_cycle_floater"
+ save_rect="true"
+ title="DAY CYCLE EDITOR"
+ width="658">
+    <tab_container
+     follows="left|top"
+     height="255"
+     layout="topleft"
+     left="0"
+     name="Day Cycle Tabs"
+     tab_position="top"
+     top="20"
+     width="656">
+        <panel
+         border="true"
+         follows="left|top|right|bottom"
+         height="255"
+         label="Day Cycle"
+         layout="topleft"
+         left="1"
+         mouse_opaque="false"
+         name="Day Cycle"
+         top="0"
+         width="654">
+            <multi_slider
+             can_edit_text="true"
+             control_name="WLTimeSlider"
+             decimal_digits="0"
+             draw_track="false"
+             follows="bottom"
+             height="10"
+             increment="0.0833333"
+             initial_value="0"
+             layout="topleft"
+             left="20"
+             max_sliders="20"
+             max_val="24"
+             name="WLTimeSlider"
+             show_text="false"
+             top="25"
+             use_triangle="true"
+             width="525" />
+            <multi_slider
+             can_edit_text="true"
+             control_name="WLDayCycleKeys"
+             decimal_digits="0"
+             follows="bottom"
+             height="10"
+             increment="0.0833333"
+             initial_value="0"
+             layout="topleft"
+             left_delta="0"
+             max_sliders="20"
+             max_val="24"
+             name="WLDayCycleKeys"
+             show_text="false"
+             top_pad="15"
+             width="525" />
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left="8"
+             name="WL12am"
+             top="74"
+             width="55">
+                12am
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left_pad="10"
+             name="WL3am"
+             top_delta="0"
+             width="55">
+                3am
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left_pad="10"
+             name="WL6am"
+             top_delta="0"
+             width="55">
+                6am
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left_pad="10"
+             name="WL9amHash"
+             top_delta="0"
+             width="55">
+                9am
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left_pad="10"
+             name="WL12pmHash"
+             top_delta="0"
+             width="55">
+                12pm
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left_pad="10"
+             name="WL3pm"
+             top_delta="0"
+             width="55">
+                3pm
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left_pad="10"
+             name="WL6pm"
+             top_delta="0"
+             width="55">
+                6pm
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left_pad="10"
+             name="WL9pm"
+             top_delta="0"
+             width="55">
+                9pm
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left_pad="10"
+             name="WL12am2"
+             top_delta="0"
+             width="55">
+                12am
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="14"
+             layout="topleft"
+             left="20"
+             name="WL12amHash"
+             top="54"
+             width="6">
+                |
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="11"
+             layout="topleft"
+             left_pad="59"
+             name="WL3amHash"
+             top_delta="3"
+             width="6">
+                I
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="14"
+             layout="topleft"
+             left_pad="59"
+             name="WL6amHash"
+             top_delta="-3"
+             width="6">
+                |
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="11"
+             layout="topleft"
+             left_pad="59"
+             name="WL9amHash2"
+             top_delta="3"
+             width="6">
+                I
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="14"
+             layout="topleft"
+             left_pad="59"
+             name="WL12pmHash2"
+             top_delta="-3"
+             width="6">
+                |
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="11"
+             layout="topleft"
+             left_pad="59"
+             name="WL3pmHash"
+             top_delta="3"
+             width="6">
+                I
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="14"
+             layout="topleft"
+             left_pad="59"
+             name="WL6pmHash"
+             top_delta="-3"
+             width="6">
+                |
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="11"
+             layout="topleft"
+             left_pad="59"
+             name="WL9pmHash"
+             top_delta="3"
+             width="6">
+                I
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="14"
+             layout="topleft"
+             left_pad="59"
+             name="WL12amHash2"
+             top_delta="-3"
+             width="6">
+                |
+            </text>
+            <button
+             height="20"
+             label="Add Key"
+             label_selected="Add Key"
+             layout="topleft"
+             left="555"
+             name="WLAddKey"
+             top="30"
+             width="96" />
+            <button
+             height="20"
+             label="Delete Key"
+             label_selected="Delete Key"
+             layout="topleft"
+             left_delta="0"
+             name="WLDeleteKey"
+             top_pad="5"
+             width="96" />
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="20"
+             name="WLCurKeyFrameText"
+             top="104"
+             width="235">
+                Key Frame Settings:
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="30"
+             name="WLCurKeyTimeText"
+             top="124"
+             width="105">
+                Key Time:
+            </text>
+            <spinner
+             control_name="WLCurKeyHour"
+             decimal_digits="0"
+             follows="left|top"
+             height="16"
+             increment="1"
+             initial_value="0"
+             label="Hour"
+             label_width="35"
+             layout="topleft"
+             left_delta="20"
+             max_val="100"
+             name="WLCurKeyHour"
+             top_pad="4"
+             width="74" />
+            <spinner
+             control_name="WLCurKeyMin"
+             decimal_digits="0"
+             follows="left|top"
+             height="16"
+             increment="5"
+             initial_value="0"
+             label="Min"
+             label_width="45"
+             layout="topleft"
+             left_pad="5"
+             max_val="55"
+             name="WLCurKeyMin"
+             top_delta="0"
+             width="85" />
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="30"
+             name="WLCurKeyTimeText2"
+             top="169"
+             width="185">
+                Key Preset:
+            </text>
+            <combo_box
+             height="18"
+             label="Preset"
+             layout="topleft"
+             left_delta="0"
+             name="WLKeyPresets"
+             top_pad="7"
+             width="205" />
+            <view_border
+             bevel_style="none"
+             follows="top|left"
+             height="115"
+             layout="topleft"
+             left="12"
+             top="101"
+             width="240" />
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_pad="15"
+             name="DayCycleText"
+             top="114"
+             width="120">
+                Snap:
+            </text>
+            <combo_box
+             enabled="false"
+             height="18"
+             label="5 min"
+             layout="topleft"
+             left_delta="0"
+             name="WLSnapOptions"
+             top_pad="7"
+             width="70" />
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="DayCycleText2"
+             top_pad="17"
+             width="120">
+                Length of Cycle:
+            </text>
+            <spinner
+             control_name="WLLengthOfDayHour"
+             decimal_digits="0"
+             follows="left|top"
+             height="16"
+             increment="1"
+             initial_value="0"
+             label="Hour"
+             label_width="33"
+             layout="topleft"
+             left_delta="-3"
+             max_val="100"
+             name="WLLengthOfDayHour"
+             top_pad="4"
+             width="74" />
+            <spinner
+             control_name="WLLengthOfDayMin"
+             decimal_digits="0"
+             follows="left|top"
+             height="16"
+             increment="1"
+             initial_value="0"
+             label="Min"
+             label_width="25"
+             layout="topleft"
+             left_pad="2"
+             max_val="59"
+             name="WLLengthOfDayMin"
+             top_delta="0"
+             width="65" />
+            <spinner
+             control_name="WLLengthOfDaySec"
+             decimal_digits="0"
+             follows="left|top"
+             height="16"
+             increment="1"
+             initial_value="24"
+             label="Sec"
+             label_width="25"
+             layout="topleft"
+             left_pad="2"
+             max_val="59"
+             name="WLLengthOfDaySec"
+             top_delta="0"
+             width="65"/>
+            <text
+             type="string"
+             halign="right"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-23"
+             name="DayCycleText3"
+             top="114"
+             width="85">
+                Preview :
+            </text>
+            <button
+             height="20"
+             label="Play"
+             label_selected="Play"
+             layout="topleft"
+             left="480"
+             name="WLAnimSky"
+             top_pad="5"
+             width="83" />
+            <button
+             height="20"
+             label="Stop!"
+             label_selected="Stop"
+             layout="topleft"
+             left_pad="4"
+             name="WLStopAnimSky"
+             top_delta="0"
+             width="83" />
+            <button
+             height="20"
+             label="Use Estate Time"
+             label_selected="Go to Estate Time"
+             layout="topleft"
+             left="480"
+             name="WLUseLindenTime"
+             top_pad="9"
+             width="170" />
+            <button
+             height="20"
+             label="Save Test Day"
+             label_selected="Save Test Day"
+             layout="topleft"
+             left_delta="0"
+             name="WLSaveDayCycle"
+             top_pad="9"
+             width="170" />
+            <button
+             height="20"
+             label="Load Test Day"
+             label_selected="Load Test Day"
+             layout="topleft"
+             left_delta="0"
+             name="WLLoadDayCycle"
+             top_pad="3"
+             width="170" />
+        </panel>
+    </tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml
index bd0a2ff330..14f9e2db95 100644
--- a/indra/newview/skins/default/xui/en/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml
@@ -1,72 +1,163 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-130" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="175" left="50" min_height="175"
-     min_width="600" mouse_opaque="true" name="Environment Editor Floater"
-     rect_control="FloaterEnvRect" title="Environment Editor" width="600">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-48" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16" 
-	     left="10" mouse_opaque="true" name="EnvTimeText" v_pad="0" width="140">
-		Time of Day
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-30" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" 
-	     left="15" mouse_opaque="true" name="EnvTimeText2" v_pad="0" width="140">
-		12:00 PM
-	</text>
-	<icon bottom="-55" follows="left|top" height="25" image_name="icon_diurnal.tga"
-	     left="85" name="EnvDayCycle" width="200" />
-	<slider bottom_delta="-20" can_edit_text="false" control_name="EnvTimeSlider"
-	     decimal_digits="2" follows="left" height="10" increment="0.0069444"
-	     initial_val="0.7" label="" left_delta="0" max_val="0.99" min_val="0"
-	     mouse_opaque="true" name="EnvTimeSlider" show_text="false" value="0.0"
-	     width="200" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16" 
-	     left="10" mouse_opaque="true" name="EnvCloudText" v_pad="0" width="140">
-		Cloud Cover
-	</text>
-	<slider bottom="-100" can_edit_text="false" control_name="EnvCloudSlider"
-	     decimal_digits="2" follows="left" height="10" increment="0.01"
-	     initial_val="0.7" label="" left="85" max_val="1" min_val="0"
-	     mouse_opaque="true" name="EnvCloudSlider" show_text="true" value="0.7"
-	     width="210" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-55" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16" 
-	     left="310" mouse_opaque="true" name="EnvWaterColorText" v_pad="0"
-	     width="140">
-		Water Color
-	</text>
-	<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
-	     can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-	     height="50" label="" left="390" mouse_opaque="true"
-	     name="EnvWaterColor" tool_tip="Click to open Color Picker" width="40" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16" 
-	     left="310" mouse_opaque="true" name="EnvWaterFogText" v_pad="0" width="140">
-		Water Fog
-	</text>
-	<slider bottom="-100" can_edit_text="false" control_name="EnvWaterFogSlider"
-	     decimal_digits="2" follows="left" height="10" increment="0.1"
-	     initial_val="0" label="" left="385" max_val="10" min_val="0"
-	     mouse_opaque="true" name="EnvWaterFogSlider" show_text="true" value="0"
-	     width="210" />
-	<button bottom="-140" follows="left|top" font="SansSerifSmall" height="20"
-	     label="Use Estate Time" left="8" name="EnvUseEstateTimeButton" width="137" />
-  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
-	     label="Use Local Time" left_delta="147" name="EnvUseLocalTimeButton" width="137" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
-	     label="Advanced Sky" left_delta="147" name="EnvAdvancedSkyButton" width="137" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
-	     label="Advanced Water" left_delta="147" name="EnvAdvancedWaterButton" width="137" />
-	<check_box bottom_delta="-30" follows="left|top" left="8" name="RegionWLOptIn" label="Use Region Environment Settings"/>
-	<string name="region_environment_tooltip">
-		Check this box to use the region's environment settings.  Uncheck this box to set your own custom environment settings.  You cannot view the region's environment settings if this box is checked.
-	</string>
-	<button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?" left="570" name="EnvSettingsHelpButton"
-		width="18" />
+<floater
+ legacy_header_height="18"
+ height="150"
+ layout="topleft"
+ name="Environment Editor Floater"
+ help_topic="environment_editor_floater"
+ save_rect="true"
+ title="ENVIRONMENT EDITOR"
+ width="600">
+    <floater.string
+     name="timeStr">
+        [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
+    </floater.string>
+    <text
+     type="string"
+     length="1"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="EnvTimeText"
+     top="32"
+     width="140">
+        Time of Day
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top|right"
+     height="16"
+     layout="topleft"
+     left="15"
+     name="EnvTimeText2"
+     top="62"
+     width="140">
+        12:00 PM
+    </text>
+    <icon
+     height="25"
+     image_name="icon_diurnal.tga"
+     layout="topleft"
+     left="85"
+     name="EnvDayCycle"
+     top="30"
+     width="200" />
+    <slider
+     control_name="EnvTimeSlider"
+     decimal_digits="2"
+     follows="left"
+     height="10"
+     increment="0.0069444"
+     initial_value="0.7"
+     layout="topleft"
+     left_delta="0"
+     max_val="0.99"
+     name="EnvTimeSlider"
+     show_text="false"
+     top_pad="10"
+     width="200" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="EnvCloudText"
+     top="86"
+     width="140">
+        Cloud Cover
+    </text>
+    <slider
+     control_name="EnvCloudSlider"
+     decimal_digits="2"
+     follows="left"
+     height="10"
+     increment="0.01"
+     initial_value="0.7"
+     layout="topleft"
+     left_delta="75"
+     name="EnvCloudSlider"
+     top_delta="4"
+     width="210" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left="310"
+     name="EnvWaterColorText"
+     top="39"
+     width="140">
+        Water Color
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     color="0.5 0.5 0.5 1"
+     follows="left|top"
+     height="50"
+     layout="topleft"
+     left="390"
+     name="EnvWaterColor"
+     tool_tip="Click to open color picker"
+     top="30"
+     width="40" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left="310"
+     name="EnvWaterFogText"
+     top="86"
+     width="140">
+        Water Fog
+    </text>
+    <slider
+     control_name="EnvWaterFogSlider"
+     decimal_digits="2"
+     follows="left"
+     height="10"
+     initial_value="0"
+     layout="topleft"
+     left_delta="75"
+     max_val="10"
+     name="EnvWaterFogSlider"
+     top_delta="4"
+     width="210" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Use Estate Time"
+     layout="topleft"
+     left="10"
+     name="EnvUseEstateTimeButton"
+     top="120"
+     width="137" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Advanced Sky"
+     layout="topleft"
+     left_pad="3"
+     name="EnvAdvancedSkyButton"
+     top_delta="0"
+     width="137" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Advanced Water"
+     layout="topleft"
+     left_pad="3"
+     name="EnvAdvancedWaterButton"
+     top_delta="0"
+     width="137" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
index 906e7de492..85a5be369c 100644
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
@@ -1,593 +1,1287 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="220" left="50" min_height="180"
-     min_width="400" mouse_opaque="true" name="WindLight floater"
-     rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
+<floater
+ legacy_header_height="18"
+ height="256"
+ layout="topleft"
+ name="WindLight floater"
+ help_topic="windlight_floater"
+ save_rect="true"
+ title="ADVANCED SKY EDITOR"
+ width="700">
+    <floater.string
+     name="WLDefaultSkyNames">
+        A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
+    </floater.string>
+    <text
+     type="string"
+     length="1"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="KeyFramePresetsText"
+     top="34"
+     width="85">
+        Sky Presets:
+    </text>
+    <combo_box
+     height="23"
+     layout="topleft"
+     left_delta="85"
+     name="WLPresetsCombo"
+     top_delta="-4"
+     width="150" />
+    <button
+     height="23"
+     label="New"
+     label_selected="New"
+     layout="topleft"
+     left_pad="3"
+     name="WLNewPreset"
+     width="70" />
+    <button
+     height="23"
+     label="Save"
+     label_selected="Save"
+     layout="topleft"
+     left_pad="3"
+     name="WLSavePreset"
+     width="70" />
+    <button
+     height="23"
+     label="Delete"
+     label_selected="Delete"
+     layout="topleft"
+     left_pad="3"
+     name="WLDeletePreset"
+     width="70" />
+    <button
+     height="23"
+     label="Day Cycle Editor"
+     label_selected="Day Cycle Editor"
+     layout="topleft"
+     right="-10"
+     name="WLDayCycleMenuButton"
+     top_pad="-23"
+     width="120" />
+    <tab_container
+     follows="left|top"
+     height="196"
+     halign="center"
+     layout="topleft"
+     left="0"
+     name="WindLight Tabs"
+     tab_position="top"
+     top="60"
      width="700">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-50" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16"
-	     left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
-	     width="110">
-		Sky Presets:
-	</text>
-	<combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
-	     left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
-	     width="150" />
-	<button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="New" label_selected="New" left_delta="170"
-	     mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Save" label_selected="Save" left_delta="80"
-	     mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Delete" label_selected="Delete" left_delta="80"
-	     mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Day Cycle Editor" label_selected="Day Cycle Editor"
-	     left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton"
-	     scale_image="true" width="120" />
-	<tab_container bottom="-220" follows="left|top" height="160" left="0"
-	     mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
-		<panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
-		     label="Atmosphere" left="1" mouse_opaque="false"
-		     name="Atmosphere" width="698">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-				Blue Horizon
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WLBlueHorizonHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-				R
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-				G
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-				B
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
-				I
-			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLBlueHorizonR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueHorizonR" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueHorizonG" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueHorizonB" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueHorizonI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
-				Haze Horizon
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WLHazeHorizonHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeHorizon"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.25" label="" left="24" max_val="1.0" min_val="0"
-			     mouse_opaque="true" name="WLHazeHorizon" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="BDensText2" v_pad="0" width="355">
-				Blue Density
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLBlueDensityHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="245" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
-				R
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
-				G
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
-				B
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
-				I
-			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLBlueDensityR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueDensityR" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueDensityG" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueDensityB" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueDensityI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
-				Haze Density
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLHazeDensityHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeDensity"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="4" min_val="0"
-			     mouse_opaque="true" name="WLHazeDensity" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
-				Density Multiplier
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WLDensityMultHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLDensityMult"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.1" label="" left="494" max_val="0.9" min_val="0"
-			     mouse_opaque="true" name="WLDensityMult" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-53" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WLDistanceMultText" v_pad="0"
-			     width="355">
-				Distance Multiplier
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WLDistanceMultHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLDistancMult"
-			     decimal_digits="1" follows="left" height="10" increment="0.1"
-			     initial_val="1.0" label="" left="494" max_val="100" min_val="0"
-			     mouse_opaque="true" name="WLDistanceMult" show_text="true" value="0.0"
-			     width="207" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
-				Max Altitude
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WLMaxAltitudeHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLMaxAltitude"
-			     decimal_digits="0" follows="left" height="10" increment="1"
-			     initial_val="500" label="" left="494" max_val="4000" min_val="0"
-			     mouse_opaque="true" name="WLMaxAltitude" show_text="true" value="4000"
-			     width="205" />
-		</panel>
-		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
-		     label="Lighting" left="1" mouse_opaque="true"
-		     name="Lighting" width="698">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="SLCText" v_pad="0" width="355">
-				Sun/Moon Color
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WLSunlightColorHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
-				R
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-				G
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-				B
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-				I
-			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLSunlightR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunlightR" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunlightG" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunlightB" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunlightI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="TODText" v_pad="0" width="355">
-				Sun/Moon Position
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WLTimeOfDayHelp" width="18" />
-			<icon bottom_delta="-30" follows="left|top" height="20" image_name="icon_diurnal.tga"
-			     left="30" name="SkyDayCycle" width="148" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLSunAngle"
-			     decimal_digits="3" follows="left" height="10" increment="0.001"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunAngle" show_text="true" value="1.0"
-			     width="204" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLAmbientText" v_pad="0" width="355">
-				Ambient
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLAmbientHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="245" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
-				R
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
-				G
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
-				B
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
-				I
-			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLAmbientR" decimal_digits="2"
-			     follows="left" height="10" increment="0.01" initial_val="0.7" label=""
-			     left="259" max_val="1" min_val="0" mouse_opaque="true" name="WLAmbientR"
-			     show_text="true" value="1.0" width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLAmbientG" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLAmbientB" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLAmbientI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLEastAngleText" v_pad="0" width="355">
-				East Angle
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLEastAngleHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLEastAngle"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.0" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLEastAngle" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="SunGlowText" v_pad="0" width="355">
-				Sun Glow
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WLSunGlowHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLGlowB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.1" label="Focus " left="494" max_val="0.5" min_val="0"
-			     mouse_opaque="true" name="WLGlowB" show_text="true" value="1.0" width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLGlowR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.25" label="Size    " left="494" max_val="1.99" min_val="1"
-			     mouse_opaque="true" name="WLGlowR" show_text="true" value="1.0" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-67" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="SceneGammaText" v_pad="0" width="200">
-				Scene Gamma
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WLSceneGammaHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLGamma"
-			     decimal_digits="2" follows="bottom" height="10" increment="0.01"
-			     initial_val="2.0" label="" left="494" max_val="10.0" min_val="0"
-			     mouse_opaque="true" name="WLGamma" show_text="true" value="2.0" width="207" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WLStarText" v_pad="0" width="355">
-				Star Brightness
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WLStarBrightnessHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLStarAlpha"
-			     decimal_digits="2" follows="bottom" height="10" increment="0.01"
-			     initial_val="0" label="" left="494" max_val="2" min_val="0"
-			     mouse_opaque="true" name="WLStarAlpha" show_text="true" value="0"
-			     width="200" />
-		</panel>
-		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
-		     label="Clouds" left="1" mouse_opaque="false" name="Clouds"
-		     width="698">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="WLCloudColorText" v_pad="0" width="355">
-				Cloud Color
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WLCloudColorHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
-				R
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-				G
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-				B
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-				I
-			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLCloudColorR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudColorR" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudColorG" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudColorB" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudColorI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="WLCloudColorText2" v_pad="0"
-			     width="355">
-				Cloud XY/Density
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WLCloudDensityHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-103" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
-				X
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
-				Y
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
-				D
-			</text>
-			<slider bottom="-117" can_edit_text="false" control_name="WLCloudX" decimal_digits="2"
-			     follows="left" height="10" increment="0.01" initial_val="0.5" label=""
-			     left="24" max_val="1" min_val="0" mouse_opaque="true" name="WLCloudX"
-			     show_text="true" value="0.5" width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudY"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudY" show_text="true" value="0.5"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDensity"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudDensity" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLCloudCoverageText" v_pad="0"
-			     width="355">
-				Cloud Coverage
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLCloudCoverageHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudCoverage"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudCoverage" show_text="true" value="0.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-55" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLCloudScaleText" v_pad="0"
-			     width="355">
-				Cloud Scale
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLCloudScaleHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudScale"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="259" max_val="1.0" min_val="0.01"
-			     mouse_opaque="true" name="WLCloudScale" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLCloudDetailText" v_pad="0"
-			     width="355">
-				Cloud Detail (XY/Density)
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLCloudDetailHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-103" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="245" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
-				X
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
-				Y
-			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText10" v_pad="0" width="10">
-				D
-			</text>
-			<slider bottom="-117" can_edit_text="false" control_name="WLCloudDetailX"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudDetailX" show_text="true" value="0.5"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailY"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudDetailY" show_text="true" value="0.5"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailDensity"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudDetailDensity" show_text="true"
-			     value="1.0" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WLCloudScrollXText" v_pad="0"
-			     width="355">
-				Cloud Scroll X
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="605" name="WLCloudScrollXHelp" width="18" />
-			<check_box control_name="WLCloudLockX" follows="left" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Lock" left="625" mouse_opaque="true"
-			     name="WLCloudLockX" width="200" />
-			<slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollX"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
-			     mouse_opaque="true" name="WLCloudScrollX" show_text="true" value="0.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-60" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WLCloudScrollYText" v_pad="0"
-			     width="355">
-				Cloud Scroll Y
-			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="605" name="WLCloudScrollYHelp" width="18" />
-			<check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Lock" left="625" mouse_opaque="true"
-			     name="WLCloudLockY" width="200" />
-			<slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollY"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
-			     mouse_opaque="true" name="WLCloudScrollY" show_text="true" value="0.0"
-			     width="200" />
-			<check_box bottom="-120" control_name="DrawClassicClouds" follows="left"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Draw Classic Clouds" left="480" mouse_opaque="true"
-			     name="DrawClassicClouds" width="200" />
-			<button bottom="-102" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="608" name="WLClassicCloudsHelp" width="18" />
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
+        <panel
+         border="true"
+         follows="left|top|right|bottom"
+         height="196"
+         label="ATMOSPHERE"
+         layout="topleft"
+         left="1"
+         mouse_opaque="false"
+         help_topic="windlight_atmosphere_tab"
+         name="Atmosphere"
+         top="60"
+         width="698">
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="BHText"
+             top="4"
+             width="355">
+                Blue Horizon
+            </text>
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="BHText2"
+             top_pad="5"
+             width="10">
+                R
+            </text>
+            <slider
+             control_name="WLBlueHorizonR"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLBlueHorizonR"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left="10"
+             top_pad="-15"
+             name="BHText3"
+             width="10">
+                G
+            </text>
+            <slider
+             control_name="WLBlueHorizonG"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="0"
+             name="WLBlueHorizonG"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             name="BHText4"
+             left="10"
+             top_pad="-15"
+             width="10">
+                B
+            </text>
+            <slider
+             control_name="WLBlueHorizonB"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             name="WLBlueHorizonB"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             name="BHText5"
+             left="10"
+             top_pad="-15"
+             width="10">
+                I
+            </text>
+            <slider
+             control_name="WLBlueHorizonI"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             layout="topleft"
+             name="WLBlueHorizonI"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="10"
+             top_pad="-10"
+             name="BDensText"
+             width="355">
+                Haze Horizon
+            </text>
+            <slider
+             control_name="WLHazeHorizon"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.25"
+             layout="topleft"
+             left="23"
+             top_delta="0"
+             top_pad="27"
+             name="WLHazeHorizon"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="245"
+             name="BDensText2"
+             top="4"
+             width="355">
+                Blue Density
+            </text>
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left="245"
+             name="BHText6"
+             top_pad="5"
+             width="10">
+                R
+            </text>
+            <slider
+             control_name="WLBlueDensityR"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLBlueDensityR"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left="245"
+             name="BHText7"
+             top_pad="-15"
+             width="10">
+                G
+            </text>
+            <slider
+             control_name="WLBlueDensityG"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="0"
+             name="WLBlueDensityG"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left="245"
+             name="BHText8"
+             top_pad="-15"
+             width="10">
+                B
+            </text>
+            <slider
+             control_name="WLBlueDensityB"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="0"
+             name="WLBlueDensityB"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left="245"
+             name="BHText9"
+             top_pad="-15"
+             width="10">
+                I
+            </text>
+            <slider
+             control_name="WLBlueDensityI"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1"
+             layout="topleft"
+             left_delta="0"
+             name="WLBlueDensityI"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="245"
+             name="HDText"
+             top_pad="-10"
+             width="355">
+                Haze Density
+            </text>
+            <slider
+             control_name="WLHazeDensity"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left="258"
+             max_val="4"
+             name="WLHazeDensity"
+             top_pad="27"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="480"
+             name="DensMultText"
+             top="4"
+             width="355">
+                Density Multiplier
+            </text>
+            <slider
+             control_name="WLDensityMult"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.1"
+             layout="topleft"
+             left_delta="13"
+             max_val="0.9"
+             name="WLDensityMult"
+             top_pad="27"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="WLDistanceMultText"
+             top_pad="-10"
+             width="355">
+                Distance Multiplier
+            </text>
+            <slider
+             control_name="WLDistancMult"
+             decimal_digits="1"
+             follows="left"
+             height="10"
+             initial_value="1.0"
+             layout="topleft"
+             left_delta="13"
+             max_val="100"
+             name="WLDistanceMult"
+             top_pad="27"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="MaxAltText"
+             top_pad="-15"
+             width="355">
+                Max Altitude
+            </text>
+            <slider
+             control_name="WLMaxAltitude"
+             decimal_digits="0"
+             follows="left"
+             height="10"
+             increment="1"
+             initial_value="500"
+             layout="topleft"
+             left_delta="13"
+             max_val="4000"
+             name="WLMaxAltitude"
+             top_pad="27"
+             width="200" />
+        </panel>
+        <panel
+         border="true"
+         follows="left|top|right|bottom"
+         height="196"
+         label="LIGHTING"
+         layout="topleft"
+         left_delta="0"
+         help_topic="windlight_lighting_tab"
+         name="Lighting"
+         top_delta="4"
+         width="698">
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="SLCText"
+             top="4"
+             width="355">
+                Sun/Moon Color
+            </text>
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="BHText"
+             top_pad="5"
+             width="10">
+                R
+            </text>
+            <slider
+             control_name="WLSunlightR"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLSunlightR"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText2"
+             top_pad="-15"
+             width="10">
+                G
+            </text>
+            <slider
+             control_name="WLSunlightG"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="0"
+             name="WLSunlightG"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText3"
+             top_pad="-15"
+             width="10">
+                B
+            </text>
+            <slider
+             control_name="WLSunlightB"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="0"
+             name="WLSunlightB"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText4"
+             top_pad="-15"
+             width="10">
+                I
+            </text>
+            <slider
+             control_name="WLSunlightI"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             layout="topleft"
+             left_delta="0"
+             name="WLSunlightI"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="TODText"
+             top_pad="-10"
+             width="355">
+                Sun/Moon Position
+            </text>
+            <icon
+             height="20"
+             image_name="icon_diurnal.tga"
+             layout="topleft"
+             left_delta="14"
+             top_pad="10"
+             name="SkyDayCycle"
+             width="148" />
+            <slider
+             control_name="WLSunAngle"
+             follows="left"
+             height="10"
+             increment="0.001"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="-8"
+             name="WLSunAngle"
+             top_pad="20"
+             width="207" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="245"
+             name="WLAmbientText"
+             top="4"
+             width="355">
+                Ambient
+            </text>
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="BHText5"
+             top_pad="5"
+             width="10">
+                R
+            </text>
+            <slider
+             control_name="WLAmbientR"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLAmbientR"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText6"
+             top_pad="-15"
+             width="10">
+                G
+            </text>
+            <slider
+             control_name="WLAmbientG"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="0"
+             name="WLAmbientG"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText7"
+             top_pad="-15"
+             width="10">
+                B
+            </text>
+            <slider
+             control_name="WLAmbientB"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="0"
+             name="WLAmbientB"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText8"
+             top_pad="-15"
+             width="10">
+                I
+            </text>
+            <slider
+             control_name="WLAmbientI"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1"
+             layout="topleft"
+             left_delta="0"
+             name="WLAmbientI"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="WLEastAngleText"
+             top_pad="-10"
+             width="355">
+                East Angle
+            </text>
+            <slider
+             control_name="WLEastAngle"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.0"
+             layout="topleft"
+             left_delta="13"
+             name="WLEastAngle"
+             top_pad="27"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="480"
+             name="SunGlowText"
+             top="4"
+             width="355">
+                Sun Glow
+            </text>
+            <slider
+             control_name="WLGlowB"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.1"
+             label="Focus "
+             layout="topleft"
+             left_delta="0"
+             max_val="0.5"
+             name="WLGlowB"
+             top_pad="27"
+             width="200" />
+            <slider
+             control_name="WLGlowR"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.25"
+             label="Size    "
+             layout="topleft"
+             left_delta="0"
+             max_val="1.99"
+             min_val="1"
+             name="WLGlowR"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="SceneGammaText"
+             top_pad="-10"
+             width="200">
+                Scene Gamma
+            </text>
+            <slider
+             control_name="WLGamma"
+             decimal_digits="2"
+             follows="bottom"
+             height="10"
+             increment="0.01"
+             initial_value="2.0"
+             layout="topleft"
+             left_delta="0"
+             max_val="10"
+             name="WLGamma"
+             top_pad="27"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="WLStarText"
+             top_pad="-10"
+             width="355">
+                Star Brightness
+            </text>
+            <slider
+             control_name="WLStarAlpha"
+             decimal_digits="2"
+             follows="bottom"
+             height="10"
+             increment="0.01"
+             initial_value="0"
+             layout="topleft"
+             left_delta="0"
+             max_val="2"
+             name="WLStarAlpha"
+             top_pad="27"
+             width="200" />
+        </panel>
+        <panel
+         border="true"
+         follows="left|top|right|bottom"
+         height="196"
+         label="CLOUDS"
+         layout="topleft"
+         left_delta="0"
+         mouse_opaque="false"
+         help_topic="windlight_clouds_tab"
+         name="Clouds"
+         top_delta="4"
+         width="698">
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="WLCloudColorText"
+             top="4"
+             width="355">
+                Cloud Color
+            </text>
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="BHText"
+             top_pad="5"
+             width="10">
+                R
+            </text>
+            <slider
+             control_name="WLCloudColorR"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLCloudColorR"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText2"
+             top_pad="-15"
+             width="10">
+                G
+            </text>
+            <slider
+             control_name="WLCloudColorG"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudColorG"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText3"
+             top_pad="-15"
+             width="10">
+                B
+            </text>
+            <slider
+             control_name="WLCloudColorB"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudColorB"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText4"
+             top_pad="-15"
+             width="10">
+                I
+            </text>
+            <slider
+             control_name="WLCloudColorI"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudColorI"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="WLCloudColorText2"
+             top_pad="-10"
+             width="355">
+                Cloud XY/Density
+            </text>
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="BHText5"
+             top_pad="5"
+             width="10">
+                X
+            </text>
+            <slider
+             control_name="WLCloudX"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLCloudX"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText6"
+             top_pad="-15"
+             width="10">
+                Y
+            </text>
+            <slider
+             control_name="WLCloudY"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLCloudY"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText7"
+             top_pad="-15"
+             width="10">
+                D
+            </text>
+            <slider
+             control_name="WLCloudDensity"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudDensity"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="245"
+             name="WLCloudCoverageText"
+             top="4"
+             width="355">
+                Cloud Coverage
+            </text>
+            <slider
+             control_name="WLCloudCoverage"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_delta="13"
+             name="WLCloudCoverage"
+             top_pad="27"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="WLCloudScaleText"
+             top_pad="-10"
+             width="355">
+                Cloud Scale
+            </text>
+            <slider
+             control_name="WLCloudScale"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             layout="topleft"
+             left_delta="13"
+             min_val="0.01"
+             name="WLCloudScale"
+             top_pad="27"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="WLCloudDetailText"
+             top_pad="-10"
+             width="355">
+                Cloud Detail (XY/Density)
+            </text>
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="BHText8"
+             top_pad="8"
+             width="10">
+                X
+            </text>
+            <slider
+             control_name="WLCloudDetailX"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_pad="3"
+             top_pad="8"
+             name="WLCloudDetailX"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText9"
+             top_pad="-15"
+             width="10">
+                Y
+            </text>
+            <slider
+             control_name="WLCloudDetailY"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudDetailY"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText10"
+             top_pad="-15"
+             width="10">
+                D
+            </text>
+            <slider
+             control_name="WLCloudDetailDensity"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudDetailDensity"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="480"
+             name="WLCloudScrollXText"
+             top="4"
+             width="355">
+                Cloud Scroll X
+            </text>
+            <check_box
+             control_name="WLCloudLockX"
+             follows="left"
+             height="16"
+             label="Lock"
+             layout="topleft"
+             left="625"
+             name="WLCloudLockX"
+             width="200" />
+            <slider
+             control_name="WLCloudScrollX"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left="494"
+             max_val="10"
+             min_val="-10"
+             name="WLCloudScrollX"
+             top="45"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-14"
+             name="WLCloudScrollYText"
+             top_delta="-1"
+             width="355">
+                Cloud Scroll Y
+            </text>
+            <check_box
+             control_name="WLCloudLockY"
+             follows="left"
+             height="16"
+             label="Lock"
+             layout="topleft"
+             left="625"
+             name="WLCloudLockY"
+             width="200" />
+            <slider
+             control_name="WLCloudScrollY"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left="494"
+             max_val="10"
+             min_val="-10"
+             name="WLCloudScrollY"
+             top="85"
+             width="200" />
+            <check_box
+             control_name="DrawClassicClouds"
+             follows="left"
+             height="16"
+             label="Draw Classic Clouds"
+             layout="topleft"
+             left="480"
+             name="DrawClassicClouds"
+             top="104"
+             width="200" />
+        </panel>
+    </tab_container>
 </floater>
-- 
cgit v1.2.3


From 9a9339d8a478976019b8a3afda6b0f57ab6a3fd2 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 31 Mar 2011 18:24:01 +0300
Subject: STORM-1126 WIP Windlight Estate Settings integration: pass 2

Added the "Use Region Environment Settings" checkbox and the "Use Local Time" button back to the environment editor.
---
 .../skins/default/xui/en/floater_env_settings.xml      | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml
index 14f9e2db95..d9eca7121d 100644
--- a/indra/newview/skins/default/xui/en/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="150"
+ height="165"
  layout="topleft"
  name="Environment Editor Floater"
  help_topic="environment_editor_floater"
@@ -133,6 +133,12 @@
      name="EnvWaterFogSlider"
      top_delta="4"
      width="210" />
+    <check_box
+     follows="left|top"
+     label="Use Region Environment Settings"
+     left="8"
+     name="RegionWLOptIn"
+     top_pad="20" />
     <button
      follows="left|top"
      height="23"
@@ -140,7 +146,15 @@
      layout="topleft"
      left="10"
      name="EnvUseEstateTimeButton"
-     top="120"
+     top_pad="6"
+     width="137" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Use Local Time"
+     left_pad="5"
+     name="EnvUseLocalTimeButton"
+     top_delta="0"
      width="137" />
     <button
      follows="left|top"
-- 
cgit v1.2.3


From 5476999e9dfeca48009b43e4fcc0967be5540572 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 31 Mar 2011 18:24:01 +0300
Subject: STORM-1126 WIP Windlight Estate Settings integration: pass 3

Added missing (lost in merge) buttons, notifications and strings.
---
 .../newview/skins/default/xui/en/notifications.xml | 85 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_region_terrain.xml  | 78 +++++++++++++++++++-
 indra/newview/skins/default/xui/en/strings.xml     |  6 ++
 3 files changed, 166 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e1aecda151..499c110651 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4281,6 +4281,91 @@ You cannot edit or delete a default preset.
 This day cycle file references a missing sky file: [SKY].
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="WLRegionApplyFail"
+   type="alertmodal">
+Sorry, the settings couldn't be applied to the region.  Leaving the region and then returning may help rectify the problem.  The reason given was: [FAIL_REASON]
+  </notification>
+
+  <notification
+   functor="GenericAcknowledge"
+   icon="alertmodal.tga"
+   name="EnvLockedUsingRegion"
+   type="alertmodal">
+You cannot load environment presets while you are using the region's environment settings.  To manually configure your environment setings, select the Environment Editor and uncheck "Use Region Environment Settings."
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   functor="GenericAcknowledge"
+   icon="alertmodal.tga"
+   name="EnvEditExternalCancel"
+   type="alertmodal">
+Warning: an update to the environment settings you were just editing was received, either because settings you recently committed have just been applied or because someone else with editing permissions updated the region's environment settings.  In order to avoid overwriting this update, your changes have been cancelled; concurrent edits are not permitted.  Please try again.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   functor="GenericAlertYesCancel"
+   icon="alertmodal.tga"
+   name="EnvEditUnsavedChangesCancel"
+   type="alertmodal">
+Warning: you have un-applied changes to the following environment settings: [SCOPE].  Are you sure you want to cancel them?
+    <usetemplate
+     name="okcancelbuttons"
+     yestext="Cancel Changes"
+     notext="Resume Editing"/>
+  </notification>
+
+  <notification
+   functor="GenericAcknowledge"
+   icon="alertmodal.tga"
+   name="EnvOtherScopeAlreadyOpen"
+   type="alertmodal">
+You cannot modify your local environment settings and region environment settings at the same time.  Close the environment settings windows currently open and try again.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   functor="GenericAcknowledge"
+   icon="alertmodal.tga"
+   name="EnvCannotDeleteLastDayCycleKey"
+   type="alertmodal">
+Unable to delete the last key in this day cycle because you cannot have an empty day cycle.  You should modify the last remaining key instead of attempting to delete it and then to create a new one.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   functor="GenericAcknowledge"
+   icon="alertmodal.tga"
+   name="DayCycleTooManyKeyframes"
+   type="alertmodal">
+You cannot add any more keyframes to this day cycle.  The maximum number of keyframes for day cycles of [SCOPE] scope is [MAX].
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   functor="GenericAcknowledge"
+   icon="alertmodal.tga"
+   name="EnvUpdateRate"
+   type="alertmodal">
+    You may only update region environmental settings every [WAIT] seconds.  Wait at least that long and then try again.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="PPSaveEffectAlert"
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index 5093c52129..e6022d467a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -123,15 +123,87 @@
      left="8"
      top="30"
      width="460" />
+    <text
+     follows="left|top"
+     height="20"
+     left="190"
+     name="wl_settings_label"
+     top_pad="10"
+     width="280">
+     WindLight environment settings for region:
+    </text>
+    <text
+     follows="left|top"
+     height="60"
+     left="190"
+     name="wl_settings_unavailable"
+     top_pad="0"
+     visible="false"
+     width="400">
+Not supported by this region, or you do not
+have permission to change the region's settings.
+See &apos;?&apos; for details.
+    </text>
+    <button
+     follows="left|top"
+     height="20"
+     label="Use Estate Time"
+     left="190"
+     name="EnvUseEstateTimeButton"
+     top_delta="0"
+     width="110" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Advanced Sky"
+     left_delta="0"
+     name="EnvAdvancedSkyButton"
+     top_pad="3"
+     width="110" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Advanced Water"
+     left_delta="0"
+     name="EnvAdvancedWaterButton"
+     top_pad="3"
+     width="110" />
+    <button
+     enabled="false"
+     follows="left|top"
+     height="20"
+     label="Apply Changes to Region"
+     left="-170"
+     top_delta="-46"
+     name="WLRegionApply"
+     width="160" />
+    <button
+     enabled="false"
+     follows="left|top"
+     height="20"
+     label="Cancel Changes"
+     left_delta="0"
+     name="WLRegionCancel"
+     top_pad="3"
+     width="160" />
+    <button
+     enabled="false"
+     follows="left|top"
+     height="20"
+     label="Revert Region to Default"
+     left_delta="0"
+     name="WLRegionDefault"
+     top_pad="3"
+     width="160" />
     <button
      follows="left|top"
      height="20"
      label="Download RAW terrain..."
      layout="topleft"
-     left_delta="2"
+     left="10"
      name="download_raw_btn"
      tool_tip="Available only to estate owners, not managers"
-     top_pad="60"
+     top="240"
      width="170" />
     <button
      follows="left|top"
@@ -141,7 +213,7 @@
      left="10"
      name="upload_raw_btn"
      tool_tip="Available only to estate owners, not managers"
-     top="243"
+     top_pad="0"
      width="170" />
     <button
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 6b3fd9ff9e..3ed4f09421 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2219,6 +2219,12 @@ Clears (deletes) the media and all params from the given face.
 	<string name="GroupOwned">Group Owned</string>
 	<string name="Public">Public</string>
 
+	<!-- Environment settings -->
+	<string name="LocalSettings">Local Settings</string>
+	<string name="RegionSettings">Region Settings</string>
+	<string name="Local">Local</string>
+	<string name="Region">Region</string>
+
 	<!-- panel classified -->
 	<string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string>
 	<string name="ClassifiedUpdateAfterPublish">(will update after publish)</string>
-- 
cgit v1.2.3


From 7419abc12ba07380593fa3c0571155b248b8c8a6 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 31 Mar 2011 18:24:01 +0300
Subject: STORM-1126 WIP Windlight Estate Settings integration: pass 5

* Added "Apply Local to Region" button to the region terrain setttings panel.
* Fixed previewing presets via a combomox in the Advanced Sky Editor floater.
---
 .../newview/skins/default/xui/en/panel_region_terrain.xml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index e6022d467a..fb94423a5c 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="top|left"
- height="320"
+ height="400"
  help_topic="panel_region_terrain_tab"
  label="Terrain"
  layout="topleft"
@@ -195,6 +195,15 @@ See &apos;?&apos; for details.
      name="WLRegionDefault"
      top_pad="3"
      width="160" />
+    <button
+     enabled="false"
+     follows="left|top"
+     height="20"
+     label="Apply Local to Region"
+     left_delta="0"
+     top_pad="3"
+     name="WLCurrentApply"
+     width="160" />
     <button
      follows="left|top"
      height="20"
@@ -203,7 +212,7 @@ See &apos;?&apos; for details.
      left="10"
      name="download_raw_btn"
      tool_tip="Available only to estate owners, not managers"
-     top="240"
+     top="330"
      width="170" />
     <button
      follows="left|top"
@@ -223,6 +232,6 @@ See &apos;?&apos; for details.
      left="10"
      name="bake_terrain_btn"
      tool_tip="Set current terrain as mid-point for raise/lower limits"
-     top="283"
+     top_pad="3"
      width="100" />
 </panel>
-- 
cgit v1.2.3


From 1ea0ffb301c07c8a66d87f48f06304fd4427b7b5 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 14 Apr 2011 00:34:42 +0300
Subject: STORM-1157 FIX Removed non-functional "Snap" checkbox.

Looks like it has never worked.
---
 .../default/xui/en/floater_day_cycle_options.xml   | 25 +---------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
index 65e2462ef8..63c8551e87 100644
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
@@ -420,31 +420,8 @@
              height="16"
              layout="topleft"
              left_pad="15"
-             name="DayCycleText"
-             top="114"
-             width="120">
-                Snap:
-            </text>
-            <combo_box
-             enabled="false"
-             height="18"
-             label="5 min"
-             layout="topleft"
-             left_delta="0"
-             name="WLSnapOptions"
-             top_pad="7"
-             width="70" />
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="0"
              name="DayCycleText2"
-             top_pad="17"
+             top_delta="71"
              width="120">
                 Length of Cycle:
             </text>
-- 
cgit v1.2.3


From e70ffa5ddb80685b4c24e27c74b69f684dc7fd23 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 15 Apr 2011 00:18:39 +0300
Subject: STORM-1160 FIX Set maximum hour value of a day cycle key to 23 (was
 100).

---
 indra/newview/skins/default/xui/en/floater_day_cycle_options.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
index 63c8551e87..b54dc87d24 100644
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
@@ -362,7 +362,7 @@
              label_width="35"
              layout="topleft"
              left_delta="20"
-             max_val="100"
+             max_val="23"
              name="WLCurKeyHour"
              top_pad="4"
              width="74" />
-- 
cgit v1.2.3


From db6862e15b1ff6257593eab798250316a350cf73 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 19 Apr 2011 23:24:28 +0300
Subject: STORM-1174 FIX Moved "Use Region Environment Settings" to the "World
 -> Edit My Environment" menu.

It has been a checkbox in the environment editor.
---
 .../skins/default/xui/en/floater_env_settings.xml      | 10 ++--------
 indra/newview/skins/default/xui/en/menu_viewer.xml     | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml
index dbd75495b1..e6cf433c8d 100644
--- a/indra/newview/skins/default/xui/en/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="165"
+ height="150"
  layout="topleft"
  name="Environment Editor Floater"
  help_topic="environment_editor_floater"
@@ -134,12 +134,6 @@
      name="EnvWaterFogSlider"
      top_delta="4"
      width="210" />
-    <check_box
-     follows="left|top"
-     label="Use Region Environment Settings"
-     left="8"
-     name="RegionWLOptIn"
-     top_pad="20" />
     <button
      follows="left|top"
      height="23"
@@ -147,7 +141,7 @@
      layout="topleft"
      left="10"
      name="EnvUseEstateTimeButton"
-     top_pad="6"
+     top_pad="20"
      width="137" />
     <button
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 51610c0ae0..150e067ab2 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -470,7 +470,7 @@
 
         <menu_item_separator/>
 
-    <menu
+        <menu
          create_jump_keys="true"
          label="Sun"
          name="Environment Settings"
@@ -523,6 +523,22 @@
                  parameter="editor" />
             </menu_item_call>
         </menu>
+	    <menu
+	     create_jump_keys="true"
+	     label="Edit My Environment"
+	     name="Environment"
+	     tear_off="true">
+            <menu_item_check
+             label="Use Region Settings"
+             name="Use Region Settings">
+                <on_check
+                 function="World.CheckEnvironment"
+                 parameter="use_region_settings" />
+                <on_click
+                 function="World.Environment"
+                 parameter="use_region_settings" />
+            </menu_item_check>
+	    </menu>
     </menu>
     <menu
      create_jump_keys="true"
-- 
cgit v1.2.3


From dab554d10613230ae7a65b8b699572d7244affbc Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 29 Apr 2011 17:59:50 +0300
Subject: STORM-1205 Add "Environment" tab to the "Region/Estate" floater
 STORM-1201 Mockup: "Create/Edit Sky Preset" floater STORM-1199 Mockup:
 "Delete Water/Sky Preset", "Delete Day Cycle" floaters STORM-1198 Mockup:
 "Create/Edit Day Cycle" floater STORM-1197 Mockup: "Create/Edit Water Preset"
 floater STORM-1196 Mockup: Environment Settings floater

---
 .../default/xui/en/floater_delete_env_preset.xml   |   50 +
 .../default/xui/en/floater_edit_day_cycle.xml      |  477 +++++++++
 .../default/xui/en/floater_edit_sky_preset.xml     | 1029 ++++++++++++++++++++
 .../default/xui/en/floater_edit_water_preset.xml   |  439 +++++++++
 .../xui/en/floater_environment_settings.xml        |  140 +++
 .../skins/default/xui/en/floater_region_info.xml   |  151 ++-
 6 files changed, 2285 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_environment_settings.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
new file mode 100644
index 0000000000..a7ab5abf38
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater
+ legacy_header_height="18"
+ height="130"
+ help_topic="environment_editor_floater"
+ layout="topleft"
+ name="Environment Editor Floater"
+ save_rect="true"
+ title="DELETE PRESETS"
+ width="550">
+    <text
+     follows="top|left|right"
+     font="SansSerif"
+     height="10"
+     layout="topleft"
+     left="50"
+     name="delete_preset"
+     top="60"
+     width="60">
+     Setting:
+    </text>
+    <combo_box
+     follows="top|left"
+     layout="topleft"
+     left_pad="10"
+     name="preset_combo"
+     top_delta="-5"
+     width="200">
+        <combo_box.item
+         label="-Select a preset-"
+         name="item0"
+         value="any" />
+    </combo_box>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Delete"
+     layout="topleft"
+     left_pad="15"
+     name="delete"
+     width="70"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="cancel"
+     width="70"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
new file mode 100644
index 0000000000..e76059751e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
@@ -0,0 +1,477 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="450"
+ layout="topleft"
+ name="Environment Editor Floater"
+ help_topic="environment_editor_floater"
+ save_rect="true"
+ title="Edit Day Cycle"
+ width="800">
+    <text
+     follows="top|left|right"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="info_string"
+     top="25"
+     width="700">
+     To edit your preset, adjust the controls then click "Save"
+    </text>
+    <text
+     follows="top|left|right"
+     font="SansSerif"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="info_string"
+     top_pad="25"
+     width="120">
+     Preset Name:
+    </text>
+    <combo_box
+     allow_text_entry="true"
+     follows="top|left"
+     layout="topleft"
+     left_pad="10"
+     name="water_preset_combo"
+     top_delta="-5"
+     width="200">
+        <combo_box.item
+         label="-Select a preset-"
+         name="item0"
+         value="any" />
+    </combo_box>
+    <text
+     follows="top|left|right"
+     height="40"
+     layout="topleft"
+     left_pad="10"
+     name="info_string"
+     top_delta="0"
+     width="405"
+     wrap="true">
+     Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
+    </text>
+ <!--======== Controls panel ========-->
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="300"
+     layout="topleft"
+     left="25"
+     name="water_panel"
+     top="100"
+     width="750"/>
+    <text
+     follows="top|left|right"
+     height="10"
+     layout="topleft"
+     name="water_preset_help"
+     right="770"
+     top="104"
+     width="100">
+     Control Help
+    </text>
+    <text
+     follows="left|top|right"
+     height="10"
+     layout="topleft"
+     left="40"    
+     name="water_color_label"
+     top="125"
+     width="300">
+     - Click on a tab to edit the specific sky settings and time.
+    </text>
+    <text
+     follows="left|top|right"
+     height="10"
+     layout="topleft"    
+     name="water_color_label"
+     top_pad="10"
+     width="300">
+     - Click and drag the tabs to set the transition times.
+    </text>
+    <text
+     follows="left|top|right"
+     height="10"
+     layout="topleft"
+     name="water_color_label"
+     top_pad="10"
+     width="300">
+     - Use the scrubber to preview your day cycle.
+    </text>
+    <panel
+     follows="top|left"
+     height="100"
+     name="day_cycle_slider"
+     layout="topleft"
+     left_delta="25"
+     top_pad="25"
+     width="670">
+        <multi_slider
+         can_edit_text="true"
+         control_name="WLTimeSlider"
+         decimal_digits="0"
+         draw_track="false"
+         follows="bottom"
+         height="10"
+         increment="0.0833333"
+         initial_value="0"
+         layout="topleft"
+         left="20"
+         max_sliders="20"
+         max_val="24"
+         name="WLTimeSlider"
+         show_text="false"
+         top_pad="0"
+         use_triangle="true"
+         width="525" />
+        <multi_slider
+         can_edit_text="true"
+         control_name="WLDayCycleKeys"
+         decimal_digits="0"
+         follows="bottom"
+         height="10"
+         increment="0.0833333"
+         initial_value="0"
+         layout="topleft"
+         left_delta="0"
+         max_sliders="20"
+         max_val="24"
+         name="WLDayCycleKeys"
+         show_text="false"
+         top_pad="15"
+         width="525" />
+        <button
+         height="20"
+         label="Add Key"
+         label_selected="Add Key"
+         layout="topleft"
+         left_pad="20"
+         name="WLAddKey"
+         top_delta="-18"
+         width="96" />
+        <button
+         height="20"
+         label="Delete Key"
+         label_selected="Delete Key"
+         layout="topleft"
+         name="WLDeleteKey"
+         top_pad="5"
+         width="96" />
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left="8"
+         name="WL12am"
+         top="74"
+         width="55">
+         12am
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL3am"
+         top_delta="0"
+         width="55">
+            3am
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL6am"
+         top_delta="0"
+         width="55">
+            6am
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL9amHash"
+         top_delta="0"
+         width="55">
+            9am
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL12pmHash"
+         top_delta="0"
+         width="55">
+            12pm
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL3pm"
+         top_delta="0"
+         width="55">
+            3pm
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL6pm"
+         top_delta="0"
+         width="55">
+            6pm
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL9pm"
+         top_delta="0"
+         width="55">
+            9pm
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL12am2"
+         top_delta="0"
+         width="55">
+            12am
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="14"
+         layout="topleft"
+         left="20"
+         name="WL12amHash"
+         top="54"
+         width="6">
+            |
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="11"
+         layout="topleft"
+         left_pad="59"
+         name="WL3amHash"
+         top_delta="3"
+         width="6">
+            I
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="14"
+         layout="topleft"
+         left_pad="59"
+         name="WL6amHash"
+         top_delta="-3"
+         width="6">
+            |
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="11"
+         layout="topleft"
+         left_pad="59"
+         name="WL9amHash2"
+         top_delta="3"
+         width="6">
+            I
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="14"
+         layout="topleft"
+         left_pad="59"
+         name="WL12pmHash2"
+         top_delta="-3"
+         width="6">
+            |
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="11"
+         layout="topleft"
+         left_pad="59"
+         name="WL3pmHash"
+         top_delta="3"
+         width="6">
+            I
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="14"
+         layout="topleft"
+         left_pad="59"
+         name="WL6pmHash"
+         top_delta="-3"
+         width="6">
+            |
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="11"
+         layout="topleft"
+         left_pad="59"
+         name="WL9pmHash"
+         top_delta="3"
+         width="6">
+            I
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="14"
+         layout="topleft"
+         left_pad="59"
+         name="WL12amHash2"
+         top_delta="-3"
+         width="6">
+        </text>
+    </panel>
+    <text
+     type="string"
+     length="1"
+     border_visible="true"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left_delta="192"
+     name="WLCurKeyTimeText2"
+     top_pad="30"
+     width="80">
+        Sky Setting:
+    </text>
+    <combo_box
+     height="18"
+     label="Preset"
+     layout="topleft"
+     left_pad="5"
+     name="WLKeyPresets"
+     width="205" />
+        <text
+     type="string"
+     length="1"
+     border_visible="true"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left_delta="-40"
+     name="WLCurKeyTimeText2"
+     top_pad="15"
+     width="35">
+        Time:
+    </text>
+    <text_editor
+     allow_scroll="false"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left_pad="3"
+     name="time"
+     top_delta="-1"
+     value="6:00 AM"
+     width="60"/> 
+        <check_box
+         follows="top|left"
+         height="10"
+         label="Make this preset my new water setting"
+         layout="topleft"
+         left="330"
+         name="new_water_preset_chb"
+         top="430"
+         width="280"/>
+        <button
+         follows="bottom|right"
+         height="23"
+         label="Save"
+         layout="topleft"
+         left_pad="0"
+         name="save"
+         width="70"/>
+        <button
+         follows="bottom|right"
+         height="23"
+         label="Cancel"
+         layout="topleft"
+         left_pad="15"
+         name="cancel"
+         width="70"/>
+ </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
new file mode 100644
index 0000000000..9d180a1f50
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -0,0 +1,1029 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="375"
+ layout="topleft"
+ name="Environment Editor Floater"
+ help_topic="environment_editor_floater"
+ save_rect="true"
+ title="Edit Sky Preset"
+ width="900">
+    <text
+     follows="top|left|right"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="info_string"
+     top="25"
+     width="700">
+     To edit your preset, adjust the controls then click "Save"
+     </text>
+    <text
+     follows="top|left|right"
+     font="SansSerif"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="info_string"
+     top_pad="25"
+     width="120">
+        Preset Name:
+    </text>
+    <combo_box
+     allow_text_entry="true"
+     follows="top|left"
+     layout="topleft"
+     left_pad="10"
+     name="water_preset_combo"
+     top_delta="-5"
+     width="200">
+        <combo_box.item
+         label="-Select a preset-"
+         name="item0"
+         value="any" />
+        </combo_box>
+    <text
+     follows="top|left|right"
+     height="40"
+     layout="topleft"
+     left_pad="10"
+     name="info_string"
+     top_delta="0"
+     width="405"
+     wrap="true">
+     Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
+    </text>
+ <!--======== Controls panel ========-->
+    <view_border
+     border="true"
+     bevel_style="none"
+     follows="top|left"
+     height="225"
+     layout="topleft"
+     left="25"
+     name="panel_water_preset"
+     top="100"
+     width="850"/>
+    <tab_container
+     follows="left|top"
+     height="225"
+     halign="center"
+     layout="topleft"
+     left="22"
+     name="WindLight Tabs"
+     tab_position="top"
+     top="101"
+     width="854">
+    <text
+     follows="top|left|right"
+     layout="topleft"
+     name="water_preset_help"
+     right="870"
+     top_pad="4"
+     width="100">
+        Control Help
+    </text>
+    <panel
+     border="true"
+     bevel_style="none"
+     follows="left|top|right|bottom"
+     height="196"
+     label="ATMOSPHERE"
+     layout="topleft"
+     left="1"
+     mouse_opaque="false"
+     help_topic="windlight_atmosphere_tab"
+     name="Atmosphere"
+     top="60"
+     width="698">
+
+         <!--======== Tab Panel I. I conlumn of controls ========--> 
+
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         font="SansSerif"
+         height="16"
+         layout="topleft"
+         left="40"
+         name="BHText"
+         top="25"
+         width="200">
+           Blue Horizon
+        </text>
+        <slider
+         control_name="WLBlueHorizonR"
+         decimal_digits="2"
+         follows="left|top"
+         height="10"
+         increment="0.01"
+         initial_value="0.7"
+         label="R"
+         layout="topleft"
+         left_delta="0"
+         top_pad="6"
+         name="WLBlueHorizonR"
+         width="200" />
+        <slider
+         control_name="WLBlueHorizonG"
+         decimal_digits="2"
+         follows="left|top"
+         height="10"
+         increment="0.01"
+         initial_value="0.7"
+         label="G"
+         layout="topleft"
+         left_delta="0"
+         name="WLBlueHorizonG"
+         top_pad="6"
+         width="200" />
+        <slider
+         control_name="WLBlueHorizonB"
+         decimal_digits="2"
+         follows="left|top"
+         height="10"
+         increment="0.01"
+         initial_value="0.7"
+         label="B"
+         layout="topleft"
+         name="WLBlueHorizonB"
+         left_delta="0"
+         top_pad="6"
+         width="200" />
+        <slider
+         control_name="WLBlueHorizonI"
+         decimal_digits="2"
+         follows="left|top"
+         height="10"
+         increment="0.01"
+         initial_value="1.0"
+         label="I"
+         layout="topleft"
+         name="WLBlueHorizonI"
+         left_delta="0"
+         top_pad="6"
+         width="200" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         font="SansSerif"
+         height="16"
+         layout="topleft"
+         left_delta="0"
+         top_pad="20"
+         name="BDensText"
+         width="200">
+            Haze Horizon
+        </text>
+        <slider
+         control_name="WLHazeHorizon"
+         decimal_digits="2"
+         follows="left|top"
+         height="10"
+         increment="0.01"
+         initial_value="0.25"
+         layout="topleft"
+         left_delta="15"
+         top_pad="6"
+         name="WLHazeHorizon"
+         width="200" />
+
+         <!--======== Tab Panel I. II conlumn of controls ========-->
+
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         font="SansSerif"
+         height="16"
+         layout="topleft"
+         left_pad="55"
+         name="BDensText2"
+         top="25"
+         width="200">
+            Blue Density
+        </text>
+        <slider
+         control_name="WLBlueDensityR"
+         decimal_digits="2"
+         follows="left|top"
+         height="10"
+         increment="0.01"
+         initial_value="0.7"
+         label="R"
+         layout="topleft"
+         left_delta="0"
+         top_pad="6"
+         name="WLBlueDensityR"
+         width="200" />
+        <slider
+         control_name="WLBlueDensityG"
+         decimal_digits="2"
+         follows="left|top"
+         height="10"
+         increment="0.01"
+         initial_value="0.7"
+         label="G"
+         layout="topleft"
+         left_delta="0"
+         name="WLBlueDensityG"
+         top_pad="6"
+         width="200" />
+        <slider
+         control_name="WLBlueDensityB"
+         decimal_digits="2"
+         follows="left|top"
+         height="10"
+         increment="0.01"
+         initial_value="0.7"
+         label="B"
+         layout="topleft"
+         left_delta="0"
+         name="WLBlueDensityB"
+         top_pad="6"
+         width="200" />
+        <slider
+         control_name="WLBlueDensityI"
+         decimal_digits="2"
+         follows="left|top"
+         height="10"
+         increment="0.01"
+         initial_value="1"
+         label="I"
+         layout="topleft"
+         left_delta="0"
+         name="WLBlueDensityI"
+         top_pad="6"
+         width="200" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         font="SansSerif"
+         height="16"
+         layout="topleft"
+         left_delta="0"
+         name="HDText"
+         top_pad="20"
+         width="200">
+            Haze Density
+        </text>
+        <slider
+         control_name="WLHazeDensity"
+         decimal_digits="2"
+         follows="left|top"
+         height="10"
+         increment="0.01"
+         initial_value="0.7"
+         layout="topleft"
+         left_delta="-15"
+         max_val="4"
+         name="WLHazeDensity"
+         top_pad="6"
+         width="200" />
+
+             <!--======== Tab Panel I. III conlumn of controls ========-->
+
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         font="SansSerif"
+         height="16"
+         layout="topleft"
+         left_pad="55"
+         name="DensMultText"
+         top="25"
+         width="200">
+           Density Multiplier
+        </text>
+            <slider
+             control_name="WLDensityMult"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.1"
+             layout="topleft"
+             left_delta="15"
+             max_val="0.9"
+             name="WLDensityMult"
+             top_pad="6"
+             width="200" />
+            
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-15"
+             name="WLDistanceMultText"
+             top_pad="20"
+             width="200">
+                Distance Multiplier
+            </text>
+            <slider
+             control_name="WLDistancMult"
+             decimal_digits="1"
+             follows="left|top"
+             height="10"
+             initial_value="1.0"
+             layout="topleft"
+             left_delta="15"
+             max_val="100"
+             name="WLDistanceMult"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-15"
+             name="MaxAltText"
+             top_pad="20"
+             width="200">
+                Max Altitude
+            </text>
+            <slider
+             control_name="WLMaxAltitude"
+             decimal_digits="0"
+             follows="left|top"
+             height="10"
+             increment="1"
+             initial_value="500"
+             layout="topleft"
+             left_delta="15"
+             max_val="4000"
+             name="WLMaxAltitude"
+             top_pad="6"
+             width="200" />
+        </panel>
+        <panel
+         border="true"
+         bevel_style="none"
+         follows="left|top|right|bottom"
+         height="196"
+         label="LIGHTING"
+         layout="topleft"
+         left_delta="0"
+         help_topic="windlight_lighting_tab"
+         name="Lighting"
+         top_delta="4"
+         width="698">
+
+         <!--======== Tab Panel II. I conlumn of controls ========-->
+
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="40"
+             name="SLCText"
+             top="25"
+             width="200">
+                Sun/Moon Color
+            </text>
+            <slider
+             control_name="WLSunlightR"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             label="R"
+             layout="topleft"
+             left_delta="0"
+             top_pad="6"
+             name="WLSunlightR"
+             width="200" />
+            <slider
+             control_name="WLSunlightG"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             label="G"
+             layout="topleft"
+             left_delta="0"
+             name="WLSunlightG"
+             top_pad="6"
+             width="200" />
+            <slider
+             control_name="WLSunlightB"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             label="B"
+             layout="topleft"
+             left_delta="0"
+             name="WLSunlightB"
+             top_pad="6"
+             width="200" />
+            <slider
+             control_name="WLSunlightI"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             layout="topleft"
+             label="I"
+             left_delta="0"
+             name="WLSunlightI"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="TODText"
+             top_pad="20"
+             width="200">
+                Sun/Moon Position
+            </text>
+            <icon
+             height="20"
+             image_name="icon_diurnal.tga"
+             layout="topleft"
+             left_delta="14"
+             top_pad="10"
+             name="SkyDayCycle"
+             use_draw_context_alpha="false"
+             width="148" />
+            <slider
+             control_name="WLSunAngle"
+             follows="left|top"
+             height="10"
+             increment="0.001"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="-8"
+             name="WLSunAngle"
+             top_pad="0"
+             width="207" />
+
+            <!--======== Tab Panel II. II conlumn of controls ========-->
+
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_pad="55"
+             name="WLAmbientText"
+             top="25"
+             width="200">
+                Ambient
+            </text>
+            <slider
+             control_name="WLAmbientR"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             label="R"
+             layout="topleft"
+             left_delta="0"
+             top_pad="6"
+             name="WLAmbientR"
+             width="200" />
+            <slider
+             control_name="WLAmbientG"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             label="G"
+             layout="topleft"
+             left_delta="0"
+             name="WLAmbientG"
+             top_pad="6"
+             width="200" />
+            <slider
+             control_name="WLAmbientB"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             label="B"
+             layout="topleft"
+             left_delta="0"
+             name="WLAmbientB"
+             top_pad="6"
+             width="200" />
+            <slider
+             control_name="WLAmbientI"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="1"
+             label="I"
+             layout="topleft"
+             left_delta="0"
+             name="WLAmbientI"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="WLEastAngleText"
+             top_pad="20"
+             width="200">
+                East Angle
+            </text>
+            <slider
+             control_name="WLEastAngle"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.0"
+             layout="topleft"
+             left_delta="15"
+             name="WLEastAngle"
+             top_pad="6"
+             width="200" />
+
+            <!--======== Tab Panel II. III conlumn of controls ========-->
+
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_pad="55"
+             name="SunGlowText"
+             top="25"
+             width="200">
+                Sun Glow
+            </text>
+            <slider
+             control_name="WLGlowB"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.1"
+             label="Focus "
+             layout="topleft"
+             left_delta="0"
+             max_val="0.5"
+             name="WLGlowB"
+             top_pad="6"
+             width="200" />
+            <slider
+             control_name="WLGlowR"
+             decimal_digits="2"
+             follows="top|left"
+             height="10"
+             increment="0.01"
+             initial_value="0.25"
+             label="Size    "
+             layout="topleft"
+             left_delta="0"
+             max_val="1.99"
+             min_val="1"
+             name="WLGlowR"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="SceneGammaText"
+             top_pad="20"
+             width="200">
+                Scene Gamma
+            </text>
+            <slider
+             control_name="WLGamma"
+             decimal_digits="2"
+             follows="top|left"
+             height="10"
+             increment="0.01"
+             initial_value="2.0"
+             layout="topleft"
+             left_delta="0"
+             max_val="10"
+             name="WLGamma"
+             top_pad="6"
+             width="200" />
+            
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="WLStarText"
+             top_pad="20"
+             width="200">
+                Star Brightness
+            </text>
+            <slider
+             control_name="WLStarAlpha"
+             decimal_digits="2"
+             follows="top|left"
+             height="10"
+             increment="0.01"
+             initial_value="0"
+             layout="topleft"
+             left_delta="0"
+             max_val="2"
+             name="WLStarAlpha"
+             top_pad="6"
+             width="200" />
+        </panel>
+        <panel
+         border="true"
+         bevel_style="none"
+         follows="left|top|right|bottom"
+         height="196"
+         label="CLOUDS"
+         layout="topleft"
+         left_delta="0"
+         mouse_opaque="false"
+         help_topic="windlight_clouds_tab"
+         name="Clouds"
+         top_delta="4"
+         width="698">
+
+            <!--======== Tab Panel III. I conlumn of controls ========-->
+
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="40"
+             name="WLCloudColorText"
+             top="25"
+             width="200">
+                Cloud Color
+            </text>
+            <slider
+             control_name="WLCloudColorR"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             label="R"
+             layout="topleft"
+             left_delta="0"
+             top_pad="6"
+             name="WLCloudColorR"
+             width="200" />
+            <slider
+             control_name="WLCloudColorG"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             label="G"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudColorG"
+             top_pad="6"
+             width="200" />
+            <slider
+             control_name="WLCloudColorB"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             label="B"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudColorB"
+             top_pad="6"
+             width="200" />
+            <slider
+             control_name="WLCloudColorI"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             label="I"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudColorI"
+             top_pad="6"
+             width="200" />
+            
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudColorText2"
+             top_pad="20"
+             width="200">
+                Cloud XY/Density
+            </text>
+            <slider
+             control_name="WLCloudX"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             label="X"
+             layout="topleft"
+             left_delta="0"
+             top_pad="6"
+             name="WLCloudX"
+             width="200" />
+            <slider
+             control_name="WLCloudY"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             label="Y"
+             layout="topleft"
+             left_delta="0"
+             top_pad="6"
+             name="WLCloudY"
+             width="200" />
+            <slider
+             control_name="WLCloudDensity"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             label="D"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudDensity"
+             top_pad="6"
+             width="200" />
+            
+            <!--======== Tab Panel III. II conlumn of controls ========-->
+            
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_pad="55"
+             name="WLCloudCoverageText"
+             top="25"
+             width="200">
+                Cloud Coverage
+            </text>
+            <slider
+             control_name="WLCloudCoverage"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_delta="15"
+             name="WLCloudCoverage"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-15"
+             name="WLCloudScaleText"
+             top_pad="20"
+             width="200">
+                Cloud Scale
+            </text>
+            <slider
+             control_name="WLCloudScale"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             layout="topleft"
+             left_delta="15"
+             min_val="0.01"
+             name="WLCloudScale"
+             top_pad="6"
+             width="200" />
+            
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="WLCloudDetailText"
+             top_pad="20"
+             width="200">
+                Cloud Detail (XY/Density)
+            </text>
+            <slider
+             control_name="WLCloudDetailX"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             label="X"
+             layout="topleft"
+             left_delta="0"
+             top_pad="6"
+             name="WLCloudDetailX"
+             width="200" />
+            <slider
+             control_name="WLCloudDetailY"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             label="Y"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudDetailY"
+             top_pad="6"
+             width="200" />
+            <slider
+             control_name="WLCloudDetailDensity"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             label="D"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudDetailDensity"
+             top_pad="6"
+             width="200" />
+            
+            <!--======== Tab Panel III. III conlumn of controls ========-->
+            
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_pad="55"
+             name="WLCloudScrollXText"
+             top="25"
+             width="150">
+                Cloud Scroll X
+            </text>
+            <check_box
+             control_name="WLCloudLockX"
+             follows="left|top"
+             height="16"
+             label="Lock"
+             layout="topleft"
+             left_delta="150"
+             name="WLCloudLockX"
+             top_delta="0"
+             width="200" />
+            <slider
+             control_name="WLCloudScrollX"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_delta="-135"
+             max_val="10"
+             min_val="-10"
+             name="WLCloudScrollX"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-15"
+             name="WLCloudScrollYText"
+             top_pad="20"
+             width="150">
+                Cloud Scroll Y
+            </text>
+            <check_box
+             control_name="WLCloudLockY"
+             follows="left|top"
+             height="16"
+             label="Lock"
+             layout="topleft"
+             left_delta="150"
+             name="WLCloudLockY"
+             width="200" />
+            <slider
+             control_name="WLCloudScrollY"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_delta="-135"
+             max_val="10"
+             min_val="-10"
+             name="WLCloudScrollY"
+             top_pad="6"
+             width="200" />
+            <check_box
+             control_name="DrawClassicClouds"
+             follows="left|top"
+             height="16"
+             label="Draw Classic Clouds"
+             layout="topleft"
+             left_delta="-15"
+             name="DrawClassicClouds"
+             top_pad="20"
+             width="200" />
+        </panel>
+    </tab_container>
+<!--======== End of Controls panel ========-->
+
+    <check_box
+     follows="top|left"
+     height="10"
+     label="Make this preset my new sky setting"
+     layout="topleft"
+     left="430"
+     name="new_water_preset_chb"
+     top_pad="30"
+     width="280"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Save"
+     layout="topleft"
+     left_pad="0"
+     name="save"
+     width="70"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     left_pad="15"
+     name="cancel"
+     width="70"/>
+ </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
new file mode 100644
index 0000000000..a29c725ee9
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="450"
+ layout="topleft"
+ name="Environment Editor Floater"
+ help_topic="environment_editor_floater"
+ save_rect="true"
+ title="Edit Water Preset"
+ width="900">
+ 
+  <text
+   follows="top|left|right"
+   height="10"
+   layout="topleft"
+   left="30"
+   name="info_string"
+   top="25"
+   width="700">
+   	To edit your preset, adjust the controls then click "Save"
+   </text>
+   
+   <text
+   follows="top|left|right"
+   font="SansSerif"
+   height="10"
+   layout="topleft"
+   left="30"
+   name="info_string"
+   top_pad="25"
+   width="120">
+   	Preset Name:
+   </text>
+   
+   <combo_box
+   	allow_text_entry="true"
+   	follows="top|left"
+   	layout="topleft"
+   	left_pad="10"
+   	name="water_preset_combo"
+   	top_delta="-5"
+   	width="200">
+      <combo_box.item
+       label="-Select a preset-"
+       name="item0"
+       value="any" />
+    </combo_box>
+   
+   <text
+   follows="top|left|right"
+   height="40"
+   layout="topleft"
+   left_pad="10"
+   name="info_string"
+   top_delta="0"
+   width="405"
+   wrap="true">
+   	Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
+   </text>
+ 
+ <!--======== Controls panel ========-->
+ <panel
+ border="true"
+ bevel_style="none"
+ follows="top|left"
+ height="300"
+ layout="topleft"
+ left="25"
+ name="panel_water_preset"
+ top="100"
+ width="850">
+ 
+  <text
+   follows="top|left|right"
+   layout="topleft"
+   name="water_preset_help"
+   right="870"
+   top_pad="4"
+   width="100">
+   Control Help
+   </text>
+
+<!--======== I conlumn of controls ========-->   
+   <text
+    follows="left|top|right"
+    height="10"
+    font="SansSerif"
+    layout="topleft"
+    left="40"    
+    name="water_color_label"
+    top="25"
+    width="200">
+       Water Fog Color
+   </text>
+   <color_swatch
+    can_apply_immediately="true"
+    follows="left|top"
+    height="60"
+    layout="topleft"
+    left_delta="15"
+    name="WaterFogColor"
+    top_pad="8"
+    width="60" />
+    
+    
+   <text
+    follows="left|top|right"
+    font="SansSerif"
+    layout="topleft"
+    left_delta="-15"
+    top_pad="0"
+    name="water_fog_destiny_label"
+    width="200">
+    	Fog Destiny Exponent
+   </text>
+   <slider
+    decimal_digits="1"
+    follows="left|top"
+    height="10"
+    initial_value="0"
+    layout="topleft"
+    left_delta="15"
+    max_val="10"
+    name="fog_destiny_exponent"
+    top_pad="10"
+    width="200"/>
+    
+    
+   <text
+    follows="left|top|right"
+    font="SansSerif"
+    layout="topleft"
+    left_delta="-15"
+    top_pad="15"
+    name="underwater_fog_modifier_label"
+    width="200">
+    	Underwater For Modifier
+   </text>
+   <slider
+    decimal_digits="1"
+    follows="left|top"
+    height="10"
+    initial_value="0"
+    layout="topleft"
+    left_delta="15"
+    max_val="10"
+    name="underwater_fog_modifier"
+    top_pad="10"
+    width="200"/>
+    
+    
+    <text
+     follows="left|top|right"
+     font="SansSerif"
+     layout="topleft"
+     left_delta="-15"
+     name="BHText"
+     top_pad="15"
+     width="200">
+        Big Wave Direction
+    </text>    
+    <slider
+     control_name="WaterWave1DirX"
+     decimal_digits="2"
+     follows="left|top"
+     increment="0.01"
+     initial_value="0.7"
+     label="X"
+     layout="topleft"             
+     max_val="4"
+     min_val="-4"
+     name="water_wave_direction_x"
+     top_pad="10"
+     width="216"/>    
+    <slider
+     control_name="WaterWave1DirY"
+     decimal_digits="2"
+     follows="left|top"
+     increment="0.01"
+     initial_value="0.7"
+     label="Y"
+     layout="topleft"
+     max_val="4"
+     min_val="-4"
+     name="water_wave_direction_y"
+     top_pad="5"
+     width="216"/>
+    
+<!--======== II conlumn of controls ========-->    
+    
+    <text
+     follows="left|top|right"
+     font="SansSerif"
+     height="10"
+     layout="topleft"
+     left_pad="55"
+     name="BDensText"
+     top="25"
+     width="200">
+        Reflection Wavelet Scale
+    </text>
+    <slider
+     control_name="WaterNormalScaleX"
+     decimal_digits="1"
+     follows="left|top"
+     initial_value="0.7"
+     layout="topleft"
+     left_delta="15"
+     max_val="10"
+     name="WaterNormalScaleX"
+     top_pad="10"
+     width="200"/>
+    <slider
+     control_name="WaterNormalScaleY"
+     decimal_digits="1"
+     follows="left|top"
+     initial_value="0.7"
+     layout="topleft"
+     max_val="10"
+     name="WaterNormalScaleY"
+     top_pad="6"
+     width="200"/>
+    <slider
+     control_name="WaterNormalScaleZ"
+     decimal_digits="1"
+     follows="left|top"
+     initial_value="0.7"
+     layout="topleft"
+     max_val="10"
+     name="WaterNormalScaleZ"
+     top_pad="6"
+     width="200"/>
+    
+    
+    <text
+     follows="left|top|right"
+     font="SansSerif"
+     layout="topleft"
+     left_delta="-15"
+     name="HDText"
+     top_pad="16"
+     width="200">
+        Fresnel Scale
+    </text>
+    <slider
+     control_name="WaterFresnelScale"
+     decimal_digits="2"
+     follows="left|top"
+     height="10"
+     increment="0.01"
+     initial_value="0.7"
+     layout="topleft"
+     left_delta="15"
+     name="WaterFresnelScale"
+     top_pad="10"
+     width="200"/>
+    <text
+     follows="left|top|right"
+     font="SansSerif"
+     layout="topleft"
+     left_delta="-15"
+     name="FresnelOffsetText"
+     top_pad="15"
+     width="200">
+        Fresnel Offset
+    </text>
+    <slider
+     control_name="WaterFresnelOffset"
+     decimal_digits="2"
+     follows="left"
+     increment="0.01"
+     initial_value="0.7"
+     layout="topleft"
+     left_delta="15"
+     name="WaterFresnelOffset"
+     top_pad="10"
+     width="200"/>
+     
+     
+     <text
+      follows="left|top|right"
+      font="SansSerif"
+      layout="topleft"
+      left_delta="-15"
+      name="BHText2"
+      top_pad="15"
+      width="200">
+         Little Wave Direction
+     </text>
+     <slider
+      control_name="WaterWave2DirX"
+      decimal_digits="2"
+      follows="left|top"
+      increment="0.01"
+      initial_value="0.7"
+      label="X"
+      layout="topleft"
+      max_val="4"
+      min_val="-4"
+      name="WaterWave2DirX"
+      top_pad="10"
+      width="216" />
+     <slider
+      control_name="WaterWave2DirY"
+      decimal_digits="2"
+      follows="left|top"
+      increment="0.01"
+      initial_value="0.7"
+      label="Y"
+      layout="topleft"
+      max_val="4"
+      min_val="-4"
+      name="WaterWave2DirY"
+      top_pad="6"
+      width="216" />
+
+<!--======== III conlumn of contorls ========-->
+
+	 <text
+      follows="left|top|right"
+      font="SansSerif"
+      height="10"
+      layout="topleft"
+      left_pad="55"
+      name="DensMultText"
+      top="25"
+      width="200">
+         Refract Scale Above
+     </text>
+     <slider
+      control_name="WaterScaleAbove"
+      decimal_digits="2"
+      follows="left|top"
+      increment="0.01"
+      initial_value="0.1"
+      layout="topleft"
+      left_delta="15"
+      name="WaterScaleAbove"
+      top_pad="10"
+      width="200" />
+     
+     <text
+      type="string"
+      length="1"
+      follows="left|top|right"
+      font="SansSerif"
+      height="16"
+      layout="topleft"
+      left_delta="-15"
+      name="WaterScaleBelowText"
+      top_pad="15"
+      width="200">
+         Refract Scale Below
+     </text>
+     <slider
+      control_name="WaterScaleBelow"
+      decimal_digits="2"
+      follows="left|top"
+      height="10"
+      increment="0.01"
+      initial_value="0"
+      layout="topleft"
+      left_delta="15"
+      name="WaterScaleBelow"
+      top_pad="10"
+      width="200"/>
+     
+     <text
+      follows="left|top|right"
+      font="SansSerif"
+      height="16"
+      layout="topleft"
+      left_delta="-15"
+      name="MaxAltText"
+      top_pad="15"
+      width="200">
+         Blur Multiplier
+     </text>
+     <slider
+      control_name="WaterBlurMult"
+      follows="left|top"
+      height="10"
+      increment="0.001"
+      initial_value="0"
+      layout="topleft"
+      left_delta="15"
+      max_val="0.16"
+      name="WaterBlurMult"
+      top_pad="10"
+      width="200"/>
+      
+      <text
+       follows="left|top|right"
+       font="SansSerif"
+       height="10"
+       layout="topleft"
+       left_delta="-15"
+       name="BHText3"
+       top_pad="15"
+       width="200">
+          Normal Map
+      </text>
+      <texture_picker
+       height="100"
+       layout="topleft"
+       left_delta="15"
+       name="WaterNormalMap"
+       top_delta="22"
+       width="100" />
+	</panel>
+<!--======== End of Controls panel ========-->	
+	<check_box
+	follows="top|left"
+	height="10"
+	label="Make this preset my new water setting"
+	layout="topleft"
+	left="430"
+	name="new_water_preset_chb"
+	top_pad="30"
+	width="280"/>
+	
+	<button
+	 follows="bottom|right"
+	 height="23"
+	 label="Save"
+	 layout="topleft"
+	 left_pad="0"
+	 name="save"
+	 width="70"/>	 
+	<button
+	 follows="bottom|right"
+	 height="23"
+	 label="Cancel"
+	 layout="topleft"
+	 left_pad="15"
+	 name="cancel"
+	 width="70"/>
+	
+ </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
new file mode 100644
index 0000000000..77cad2a2bd
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="400"
+ layout="topleft"
+ name="Environment Editor Floater"
+ help_topic="environment_editor_floater"
+ save_rect="true"
+ title="ENVIRONMENT EDITOR"
+ width="600">
+ 
+ <!-- Water Settings -->
+ <view_border
+  bevel_style="none"  
+  follows="top|left"
+  height="100"
+  layout="topleft"
+  left="50"
+  name="water_panel"
+  top="50"
+  width="500"/> 
+ <text
+  name="water_settings_title"
+  follows="top|left"
+  height="16"
+  layout="topleft"
+  left_delta="5"
+  top_delta="5"
+  width="35">
+  		Water
+  </text>
+  
+  <radio_group
+   follows="top|left"
+   height="45"
+   layout="topleft"
+   name="water_settings_radio_group"   
+   top_pad="20"
+   width="200">
+  	<radio_item  	 
+  	 label="Use region settings"
+  	 layout="topleft"
+  	 name="region_water_settings"/>
+  	<radio_item  	 
+  	 label="Use my settings"
+  	 layout="topleft"
+  	 name="my_water_settings"
+  	 top_pad="20"/>  	
+  </radio_group>
+  <combo_box
+   follows="top|left"
+   left_pad="2"
+   name="water_settings_preset_combo"
+   top_delta="24"
+   width="200">
+      <combo_box.item
+       label="-Select a preset-"
+       name="item0"
+       value="any" />
+  </combo_box>
+ 
+ 
+ <!-- Sky/Day Cycle Settings -->  
+ <view_border
+  bevel_style="none"  
+  follows="top|left"
+  height="180"
+  layout="topleft"
+  left="50"
+  name="sky_dayc_panel"
+  top="175"
+  width="500"/> 
+ <text
+  name="sky_dayc_settings_title"
+  follows="top|left"
+  height="16"
+  layout="topleft"
+  left="55"
+  top_delta="5"
+  width="100">
+  		Sky / Day Cycle
+  </text>
+  
+  <radio_group
+   follows="top|left"
+   height="45"
+   layout="topleft"
+   name="sky_dayc_settings_radio_group1"
+   top_pad="20"
+   width="200">
+  	<radio_item
+  	 layout="topleft"
+  	 label="Use region settings"
+  	 name="region_sky_dayc_settings"/>
+  	<radio_item
+  	 layout="topleft"
+  	 label="Use my settings"
+  	 name="my_sky_dayc_settings"
+  	 top_pad="20"/>  	
+  </radio_group>
+  
+  <radio_group
+   layout="topleft"
+   left_delta="50"
+   name="sky_dayc_settings_radio_group2"
+   top_pad="10"
+   height="50"
+   width="150">
+  	<radio_item
+  	 layout="topleft"
+  	 label="Fixed sky"
+  	 name="my_sky_settings"/>
+  	<radio_item
+  	 layout="topleft"
+  	 label="Day cycle"
+  	 name="my_dayc_settings"
+  	 top_pad="25"/>  	
+  </radio_group>
+  <combo_box
+   follows="top|left"
+   left_pad="2"
+   name="sky_settings_preset_combo"
+   top_delta="-7"
+   width="200">
+      <combo_box.item
+       label="-Select a preset-"
+       name="item0"
+       value="any" />
+  </combo_box>
+    <combo_box
+   follows="top|left"
+   name="dayc_settings_preset_combo"
+   top_delta="36"
+   width="200">
+      <combo_box.item
+       label="-Select a preset-"
+       name="item0"
+       value="any" />
+  </combo_box>		
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index 32fb6f97e7..017c70cf49 100644
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
@@ -16,5 +16,154 @@
      name="region_panels"
      right="-1"
      tab_position="top"
-     top="20" />
+     top="20">
+     
+     <!-- Temporary panel. It will be deleted from this xml. It'll be added the same way as others tab panels -->
+    <panel
+     border="true"
+     bevel_style="none"
+	 follows="top|left"
+	 height="320"
+	 label="Emvironment"
+	 layout="topleft"
+	 left="0"
+	 name="environment_tab"
+	 width="4250">
+	 
+	 <!-- Water Settings --> 
+	 <view_border
+	  bevel_style="none"  
+	  follows="top|left"
+	  height="100"
+	  layout="topleft"
+	  left="50"
+	  name="water_panel"
+	  top="50"
+	  width="430"/> 
+	 <text
+	  name="water_settings_title"
+	  follows="top|left"
+	  height="16"
+	  layout="topleft"
+	  left_delta="5"
+	  top_delta="5"
+	  width="35">
+	  		Water
+	  </text>
+	  
+	  <radio_group
+	   follows="top|left"
+	   height="45"
+	   layout="topleft"
+	   name="water_settings_radio_group"   
+	   top_pad="20"
+	   width="200">
+	  	<radio_item  	 
+	  	 label="Use region settings"
+	  	 layout="topleft"
+	  	 name="region_water_settings"/>
+	  	<radio_item  	 
+	  	 label="Use my settings"
+	  	 layout="topleft"
+	  	 name="my_water_settings"
+	  	 top_pad="20"/>  	
+	  </radio_group>
+	  <combo_box
+	   follows="top|left"
+	   left_pad="2"
+	   name="water_settings_preset_combo"
+	   top_delta="24"
+	   width="200">
+	  </combo_box>
+	 
+	 
+	 <!-- Sky/Day Cycle Settings -->  
+	 <view_border
+	  bevel_style="none"  
+	  follows="top|left"
+	  height="180"
+	  layout="topleft"
+	  left="50"
+	  name="sky_dayc_panel"
+	  top="175"
+	  width="430"/> 
+	 <text
+	  name="sky_dayc_settings_title"
+	  follows="top|left"
+	  height="16"
+	  layout="topleft"
+	  left="55"
+	  top_delta="5"
+	  width="100">
+	  		Sky / Day Cycle
+	  </text>
+	  
+	  <radio_group
+	   follows="top|left"
+	   height="45"
+	   layout="topleft"
+	   name="sky_dayc_settings_radio_group1"
+	   top_pad="20"
+	   width="200">
+	  	<radio_item
+	  	 layout="topleft"
+	  	 label="Use region settings"
+	  	 name="region_sky_dayc_settings"/>
+	  	<radio_item
+	  	 layout="topleft"
+	  	 label="Use my settings"
+	  	 name="my_sky_dayc_settings"
+	  	 top_pad="20"/>  	
+	  </radio_group>
+	  
+	  <radio_group
+	   layout="topleft"
+	   left_delta="50"
+	   name="sky_dayc_settings_radio_group2"
+	   top_pad="10"
+	   height="50"
+	   width="150">
+	  	<radio_item
+	  	 layout="topleft"
+	  	 label="Fixed sky"
+	  	 name="my_sky_settings"/>
+	  	<radio_item
+	  	 layout="topleft"
+	  	 label="Day cycle"
+	  	 name="my_dayc_settings"
+	  	 top_pad="25"/>  	
+	  </radio_group>
+	  <combo_box
+	   follows="top|left"
+	   left_pad="2"
+	   name="sky_settings_preset_combo"
+	   top_delta="-7"
+	   width="200">
+	  </combo_box>
+	    <combo_box
+	   follows="top|left"
+	   name="dayc_settings_preset_combo"
+	   top_delta="36"
+	   width="200">
+	  </combo_box>
+	  
+	  <button
+	   follows="bottom|right"
+	   height="23"
+	   label="Save"
+	   layout="topleft"
+	   left_pad="0"
+	   name="save"
+	   width="70"/>	 
+	 <button
+	   follows="bottom|right"
+	   height="23"
+	   label="Cancel"
+	   layout="topleft"
+	   left_pad="15"
+	   name="cancel"
+	   width="70"/>
+     </panel>
+     
+     </tab_container>
 </floater>
-- 
cgit v1.2.3


From f5bb046c5d3d393352b5b90424837a3d213dfbb9 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 29 Apr 2011 18:58:28 +0300
Subject: STORM-1208 Mockup: "Top level menu 'Environment Editor'"

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 108 +++++++++++++++++++--
 1 file changed, 98 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index afb78097d8..2b046dbaec 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -512,16 +512,6 @@
                  function="World.EnvSettings"
                  parameter="default" />
             </menu_item_call>
-
-            <menu_item_separator/>
-
-            <menu_item_call
-             label="Environment Editor"
-             name="Environment Editor">
-                <menu_item_call.on_click
-                 function="World.EnvSettings"
-                 parameter="editor" />
-            </menu_item_call>
         </menu>
 	    <menu
 	     create_jump_keys="true"
@@ -539,6 +529,104 @@
                  parameter="use_region_settings" />
             </menu_item_check>
 	    </menu>
+	    
+   
+	    <menu
+	     create_jump_keys="true"
+	     label="Enviroment Editor"
+	     name="Enviroment Editor"
+	     tear_off="true">
+	     	
+	     	<menu_item_call
+	     	 label="Enviroment Settings..."
+	     	 name="Enviroment Settings">
+	     	 	<menu_item_call.on_click
+	     	 	 function="World.EnvSettings"
+                 parameter="editor"/>
+	     	</menu_item_call>
+	     	
+	     	<menu_item_separator/>
+	     	
+	     	<menu
+	     	 name="Water Presets"
+	     	 label="Water Presets">
+	     	 	<menu_item_call
+	     	 	 label="New preset..."
+	     	 	 name="new_water_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="stub"
+	     	 	 	parameter="stub"/>
+	     	 	</menu_item_call>
+	     	 	<menu_item_call
+	     	 	 label="Edit preset..."
+	     	 	 name="edit_water_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="stub"
+	     	 	 	parameter="stub"/>
+	     	 	</menu_item_call>
+	     	 	<menu_item_call
+	     	 	 label="Delete preset..."
+	     	 	 name="delete_water_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="stub"
+	     	 	 	parameter="stub"/>
+	     	 	</menu_item_call>
+	     	</menu>
+	     	
+	     	<menu
+	     	 name="Sky Presets"
+	     	 label="Sky Presets">
+	     	 	<menu_item_call
+	     	 	 label="New preset..."
+	     	 	 name="new_sky_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="stub"
+	     	 	 	parameter="stub"/>
+	     	 	</menu_item_call>
+	     	 	<menu_item_call
+	     	 	 label="Edit preset..."
+	     	 	 name="edit_sky_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="stub"
+	     	 	 	parameter="stub"/>
+	     	 	</menu_item_call>
+	     	 	<menu_item_call
+	     	 	 label="Delete preset..."
+	     	 	 name="delete_sky_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="stub"
+	     	 	 	parameter="stub"/>
+	     	 	</menu_item_call>
+	     	</menu>
+	     	
+	     	<menu
+	     	 name="Day Presets"
+	     	 label="Day Presets">
+	     	 	<menu_item_call
+	     	 	 label="New preset..."
+	     	 	 name="new_day_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="stub"
+	     	 	 	parameter="stub"/>
+	     	 	</menu_item_call>
+	     	 	<menu_item_call
+	     	 	 label="Edit preset..."
+	     	 	 name="edit_day_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="stub"
+	     	 	 	parameter="stub"/>
+	     	 	</menu_item_call>
+	     	 	<menu_item_call
+	     	 	 label="Delete preset..."
+	     	 	 name="delete_day_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="stub"
+	     	 	 	parameter="stub"/>
+	     	 	</menu_item_call>
+	     	</menu>
+	    </menu>
+    
+    
     </menu>
     <menu
      create_jump_keys="true"
-- 
cgit v1.2.3