STORM-1262 FIXED Removed the original Windlight Region Settings implementation.

6 files changed, 0 insertions, 2485 deletions

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
deleted file mode 100644
index 59cdb295ef..0000000000
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,416 +0,0 @@
-<?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="23"
-             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" />
-        </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
deleted file mode 100644
index e6cf433c8d..0000000000
--- a/indra/newview/skins/default/xui/en/floater_env_settings.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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"
-     use_draw_context_alpha="false"
-     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_pad="20"
-     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"
-     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_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml
deleted file mode 100644
index 3a44ba3763..0000000000
--- a/indra/newview/skins/default/xui/en/floater_water.xml
+++ /dev/null
@@ -1,503 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="240"
- layout="topleft"
- name="Water Floater"
- help_topic="water_floater"
- save_rect="true"
- title="ADVANCED WATER EDITOR"
- width="700">
-    <floater.string
-     name="WLDefaultWaterNames">
-        Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-    </floater.string>
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="KeyFramePresetsText"
-     top="34"
-     font="SansSerif"
-     width="85">
-        Water Presets:
-    </text>
-    <combo_box
-     height="23"
-     layout="topleft"
-     left_delta="95"
-     name="WaterPresetsCombo"
-     top_delta="-4"
-     width="150" />
-    <button
-     height="23"
-     label="New"
-     label_selected="New"
-     layout="topleft"
-     left_pad="3"
-     name="WaterNewPreset"
-     top_delta="0"
-     width="70" />
-    <button
-     height="23"
-     label="Save"
-     label_selected="Save"
-     layout="topleft"
-     left_pad="3"
-     name="WaterSavePreset"
-     top_delta="0"
-     width="70" />
-    <button
-     height="23"
-     label="Delete"
-     label_selected="Delete"
-     layout="topleft"
-     left_pad="3"
-     name="WaterDeletePreset"
-     top_delta="0"
-     width="70" />
-    <tab_container
-    border="false"
-     follows="left|top"
-     height="180"
-     halign="center"
-     layout="topleft"
-     left="0"
-     name="Water Tabs"
-     tab_position="top"
-     top="60"
-     width="700">
-        <panel
-         border="true"
-         follows="all"
-         height="180"
-         label="SETTINGS"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         help_topic="water_settings_tab"
-         name="Settings"
-         top="0"
-         width="698">
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="BHText"
-             top="4"
-             width="200">
-                Water Fog Color
-            </text>
-            <color_swatch
-             can_apply_immediately="true"
-             color="0.5 0.5 0.5 1"
-             follows="left|top"
-             height="50"
-             layout="topleft"
-             left="40"
-             name="WaterFogColor"
-             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="10"
-             name="WaterFogDensText"
-             top="84"
-             width="200">
-                Fog Density Exponent
-            </text>
-            <slider
-             control_name="WaterFogDensity"
-             decimal_digits="1"
-             follows="left"
-             height="10"
-             initial_value="16"
-             layout="topleft"
-             left="24"
-             max_val="10"
-             name="WaterFogDensity"
-             top="124"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-14"
-             name="WaterUnderWaterFogModText"
-             top="124"
-             width="200">
-                Underwater Fog Modifier
-            </text>
-            <slider
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="16"
-             layout="topleft"
-             left="24"
-             max_val="2"
-             name="WaterUnderWaterFogMod"
-             top="164"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="BDensText"
-             top="4"
-             width="200">
-                Reflection Wavelet Scale
-            </text>
-            <slider
-             control_name="WaterNormalScaleX"
-             decimal_digits="1"
-             follows="left"
-             height="15"
-             initial_value="0.7"
-             label="1"
-             layout="topleft"
-             max_val="10"
-             name="WaterNormalScaleX"
-             top_pad="24"
-             width="200" />
-            <slider
-             control_name="WaterNormalScaleY"
-             decimal_digits="1"
-             follows="left"
-             height="15"
-             initial_value="0.7"
-             label="2"
-             layout="topleft"
-             max_val="10"
-             name="WaterNormalScaleY"
-             top_pad="4"
-             width="200" />
-            <slider
-             control_name="WaterNormalScaleZ"
-             decimal_digits="1"
-             follows="left"
-             height="15"
-             initial_value="0.7"
-             label="3"
-             layout="topleft"
-             max_val="10"
-             name="WaterNormalScaleZ"
-             top_pad="4"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             name="HDText"
-             top="84"
-             width="200">
-                Fresnel Scale
-            </text>
-            <slider
-             control_name="WaterFresnelScale"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             name="WaterFresnelScale"
-             top="124"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             name="FresnelOffsetText"
-             top="124"
-             width="200">
-                Fresnel Offset
-            </text>
-            <slider
-             control_name="WaterFresnelOffset"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             name="WaterFresnelOffset"
-             top="164"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="480"
-             name="DensMultText"
-             top="4"
-             width="200">
-                Refract Scale Above
-            </text>
-            <slider
-             control_name="WaterScaleAbove"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.1"
-             layout="topleft"
-             left="494"
-             name="WaterScaleAbove"
-             top="44"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-14"
-             name="WaterScaleBelowText"
-             top="44"
-             width="200">
-                Refract Scale Below
-            </text>
-            <slider
-             control_name="WaterScaleBelow"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0"
-             layout="topleft"
-             left="494"
-             name="WaterScaleBelow"
-             top="84"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-14"
-             name="MaxAltText"
-             top="84"
-             width="200">
-                Blur Multiplier
-            </text>
-            <slider
-             control_name="WaterBlurMult"
-             follows="left"
-             height="10"
-             increment="0.001"
-             initial_value="0"
-             layout="topleft"
-             left="494"
-             max_val="0.16"
-             name="WaterBlurMult"
-             top="124"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="all"
-         height="180"
-         label="IMAGE"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         help_topic="water_waves_tab"
-         name="Waves"
-         top="0"
-         width="698">
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="BHText"
-             top="4"
-             width="200">
-                Big Wave Direction
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="WaterWave1DirXText"
-             top_pad="5"
-             width="10">
-                X
-            </text>
-            <slider
-             control_name="WaterWave1DirX"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left="24"
-             max_val="4"
-             min_val="-4"
-             name="WaterWave1DirX"
-             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="WaterWave1DirYText"
-             top_pad="-15"
-             width="10">
-                Y
-            </text>
-            <slider
-             control_name="WaterWave1DirY"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             max_val="4"
-             min_val="-4"
-             name="WaterWave1DirY"
-             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="BHText2"
-             top_pad="-10"
-             width="355">
-                Little Wave Direction
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="10"
-             left_delta="0"
-             name="WaterWave2DirXText"
-             top_pad="5"
-             width="10">
-                X
-            </text>
-            <slider
-             control_name="WaterWave2DirX"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left="24"
-             max_val="4"
-             min_val="-4"
-             name="WaterWave2DirX"
-             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="WaterWave2DirYText"
-             top_pad="-15"
-             width="10">
-                Y
-            </text>
-            <slider
-             control_name="WaterWave2DirY"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             max_val="4"
-             min_val="-4"
-             name="WaterWave2DirY"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="240"
-             name="BHText3"
-             top="4"
-             width="200">
-                Normal Map
-            </text>
-            <texture_picker
-             height="143"
-             layout="topleft"
-             left="250"
-             name="WaterNormalMap"
-             top="22"
-             width="128" />
-        </panel>
-    </tab_container>
-</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
deleted file mode 100644
index 9fbb784c76..0000000000
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ /dev/null
@@ -1,1278 +0,0 @@
-<?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="135">
-        Sky Presets:
-    </text>
-    <combo_box
-     height="23"
-     layout="topleft"
-     left_delta="135"
-     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">
-        <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"
-             use_draw_context_alpha="false"
-             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" />
-        </panel>
-    </tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 60ab4d2bc5..4ef64269e8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4854,18 +4854,6 @@ Do you wish to overwrite the saved preset?
 
   <notification
    icon="alertmodal.tga"
-   name="WLDeletePresetAlert"
-   type="alertmodal">
-Do you wish to delete [SKY]?
-    <tag>confirm</tag>
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
    name="WLNoEditDefault"
    type="alertmodal">
 You cannot edit or delete a default preset.
@@ -4890,40 +4878,6 @@ Sorry, the settings couldn't be applied to the region.  Leaving the region and t
   <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.
@@ -4966,74 +4920,6 @@ PostProcess Effect exists. Do you still wish overwrite it?
   </notification>
 
   <notification
-   icon="alert.tga"
-   name="NewSkyPreset"
-   type="alert">
-Give me a name for the new sky.
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message" type="text">
-New Preset
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ExistsSkyPresetAlert"
-   type="alertmodal">
-Preset already exists!
-  <tag>fail</tag>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="NewWaterPreset"
-   type="alert">
-Give me a name for the new water preset.
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message" type="text">
-New Preset
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ExistsWaterPresetAlert"
-   type="alertmodal">
-Preset already exists!
-  <tag>fail</tag>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WaterNoEditDefault"
-   type="alertmodal">
-You cannot edit or delete a default preset.
-  <tag>fail</tag>
-  </notification>
-
-  <notification
    icon="alertmodal.tga"
    name="ChatterBoxSessionStartError"
    type="alertmodal">
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f1468797c1..09bff0a46c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2358,8 +2358,6 @@ Returns a string with the requested data about the region
 	<!-- 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>