From 834498d1717baa69e55b6609d602026248dfacc1 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 11 May 2018 10:46:15 -0700
Subject: Remove the old sky and water edit dialogs.

---
 .../default/xui/en/floater_edit_sky_preset.xml     | 980 ---------------------
 .../default/xui/en/floater_edit_water_preset.xml   | 448 ----------
 indra/newview/skins/default/xui/en/menu_viewer.xml |   5 +-
 3 files changed, 4 insertions(+), 1429 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_edit_water_preset.xml

(limited to 'indra/newview/skins')

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
deleted file mode 100644
index c03a206e88..0000000000
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ /dev/null
@@ -1,980 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="375"
- layout="topleft"
- name="Edit Sky Preset"
- help_topic="sky_preset"
- save_rect="true"
- title="Edit Sky Preset"
- width="840">
-
-    <string name="title_new">Create a New Sky Preset</string>
-    <string name="title_edit">Edit Sky Preset</string>
-    <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string>
-    <string name="hint_edit">To edit your sky preset, adjust the controls and click "Save".</string>
-    <string name="combo_label">-Select a preset-</string>
-
-    <text
-     follows="top|left|right"
-     height="10"
-     layout="topleft"
-     left="30"
-     name="hint"
-     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="label"
-     top_pad="25"
-     width="120">
-        Preset Name:
-    </text>
-    <combo_box
-     allow_text_entry="true"
-     follows="top|left"
-     layout="topleft"
-     left_pad="10"
-     max_chars="100"
-     name="sky_preset_combo"
-     top_delta="-5"
-     width="200"/>
-    <line_editor
-     height="20"
-     left_delta="0"
-     name="sky_preset_name"
-     top_delta="0"
-     width="200" />
-    <text
-     follows="top|left|right"
-     height="40"
-     layout="topleft"
-     left_pad="10"
-     name="note"
-     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="203"
-     layout="topleft"
-     left="25"
-     name="panel_water_preset"
-     top="122"
-     visible="true"
-     width="790"/>
-    <tab_container
-     follows="left|top"
-     height="225"
-     halign="center"
-     layout="topleft"
-     left="22"
-     name="WindLight Tabs"
-     tab_position="top"
-     top="101"
-     width="794">
-    <panel
-     border="true"
-     bevel_style="none"
-     follows="left|top|right|bottom"
-     height="196"
-     label="ATMOSPHERE"
-     layout="topleft"
-     left="1"
-     help_topic="sky_preset_atmosphere"
-     mouse_opaque="false"
-     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>
-        <color_swatch
-         can_apply_immediately="true"
-         follows="left|top"
-         height="37"
-         label_height="0"
-         layout="topleft"
-         left_delta="0"
-         name="WLBlueHorizon"
-         top_pad="6"
-         width="60" />
-        <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="0"
-         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>
-        <color_swatch
-         can_apply_immediately="true"
-         follows="left|top"
-         height="37"
-         label_height="0"
-         layout="topleft"
-         left_delta="0"
-         name="WLBlueDensity"
-         top_pad="6"
-         width="60" />
-        <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="0"
-         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="sky_preset_lighting"
-         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="20"
-             name="SLCText"
-             top="25"
-             width="150">
-                Sun/Moon Color
-            </text>
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="37"
-             label_height="0"
-             layout="topleft"
-             left_delta="10"
-             name="WLSunlight"
-             top_pad="6"
-             width="60" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-10"
-             name="WLAmbientText"
-             top_pad="20"
-             width="150">
-                Ambient
-            </text>
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="37"
-             label_height="0"
-             layout="topleft"
-             left_delta="10"
-             name="WLAmbient"
-             top_pad="6"
-             width="60" />
-
-            <!--======== Tab Panel II. II conlumn of controls ========-->
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_pad="100"
-             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="10"
-             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="-10"
-             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="10"
-             max_val="2"
-             name="WLStarAlpha"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-10"
-             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="10"
-             max_val="10"
-             name="WLGamma"
-             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="60"
-             name="TODText"
-             top="25"
-             width="200">
-                Sun/Moon Position
-            </text>
-            
-            <joystick_quat
-              follows="left|top"
-              height="78"
-              layout="topleft"
-              left_delta="0"
-              name="WLSunRotation"
-              quadrant="left"
-              sound_flags="3"
-              visible="true"
-              tool_tip="Move sun in sky"
-              top="44"
-              width="78" />              />
-
-            <joystick_quat
-              follows="left|top"
-              height="78"
-              layout="topleft"
-              left_delta="96"
-              name="WLMoonRotation"
-              quadrant="left"
-              sound_flags="3"
-              visible="true"
-              tool_tip="Move moon in sky"
-              top="44"
-              width="78" />              />
-              
-            <!-- multi_slider
-             can_edit_text="true"
-             control_name="WLSunPos"
-             decimal_digits="0"
-             follows="bottom"
-             height="10"
-             increment="0.0833333"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             max_sliders="1"
-             max_val="24"
-             name="WLSunPos"
-             show_text="false"
-             top_pad="0"
-             width="300" />
-
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_delta="2"
-             name="WL12amHash"
-             top_pad="6"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="66"
-             name="WL6amHash"
-             top_delta="0"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="67"
-             name="WL12pmHash2"
-             top_delta="0"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="67"
-             name="WL6pmHash"
-             top_delta="0"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="67"
-             name="WL12amHash2"
-             top_delta="0"
-             width="6">
-             |
-            </text>
-
-
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_delta="-300"
-             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="20"
-             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="15"
-             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="18"
-             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="15"
-             name="WL12am2"
-             top_delta="0"
-             width="55">
-                12am
-            </text>
-
-            <time
-             follows="left|top"
-             height="16"
-             label_width="0"
-             layout="topleft"
-             left_delta="-175"
-             name="WLDayTime"
-             top_pad="15"
-             value="6:00 AM"
-             width="75"/> 
-
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-106"
-             name="WLEastAngleText"
-             top_pad="24"
-             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="10"
-             name="WLEastAngle"
-             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="sky_preset_clouds"
-         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>
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="37"
-             label_height="0"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudColor"
-             top_pad="6"
-             width="60" />
-            <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="15"
-             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="15"
-             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" />
-        </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="380"
-     name="make_default_cb"
-     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
deleted file mode 100644
index 905983e7fa..0000000000
--- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
+++ /dev/null
@@ -1,448 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="375"
- layout="topleft"
- name="Edit Water Preset"
- help_topic="water_preset"
- save_rect="true"
- title="Edit Water Preset"
- width="725">
-
-  <string name="title_new">Create a New Water Preset</string>
-  <string name="title_edit">Edit a Water Preset</string>
-  <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string>
-  <string name="hint_edit">To edit your water preset, adjust the controls and click "Save".</string>
-  <string name="combo_label">-Select a preset-</string>
-
-  <text
-   follows="top|left|right"
-   height="10"
-   layout="topleft"
-   left="30"
-   name="hint"
-   top="25"
-   width="680">
-   	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="label"
-   top_pad="25"
-   width="120">
-   	Preset Name:
-   </text>
-   
-   <combo_box
-   	allow_text_entry="true"
-   	follows="top|left"
-   	layout="topleft"
-   	left_pad="10"
-   	max_chars="100"
-   	name="water_preset_combo"
-   	top_delta="-5"
-   	width="200"/>
-
-   <line_editor
-    height="20"
-    left_delta="0"
-    name="water_preset_name"
-    top_delta="0"
-    width="200" />
-   
-   <text
-   follows="top|left|right"
-   height="40"
-   layout="topleft"
-   left_pad="10"
-   name="note"
-   top_delta="0"
-   width="340"
-   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="false"
-  bevel_style="none"
-  follows="top|left"
-  height="230"
-  layout="topleft"
-  left="10"
-  name="panel_water_preset"
-  top="100"
-  width="700">
- 
-<!--======== I conlumn of controls ========-->   
-   <text
-    follows="left|top|right"
-    height="10"
-    font="SansSerif"
-    layout="topleft"
-    left="10"    
-    name="water_color_label"
-    top="5"
-    width="215">
-       Water Fog Color
-   </text>
-   <color_swatch
-    can_apply_immediately="true"
-    follows="left|top"
-    height="37"
-    label_height="0"
-    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="10"
-    name="water_fog_density_label"
-    width="215">
-    	Fog Density Exponent
-   </text>
-   <slider
-    decimal_digits="1"
-    follows="left|top"
-    height="10"
-    initial_value="0"
-    layout="topleft"
-    left_delta="15"
-    max_val="10"
-    name="WaterFogDensity"
-    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="215">
-    	Underwater Fog Modifier
-   </text>
-   <slider
-    decimal_digits="1"
-    follows="left|top"
-    height="10"
-    initial_value="0"
-    layout="topleft"
-    left_delta="15"
-    max_val="10"
-    name="WaterUnderWaterFogMod"
-    top_pad="10"
-    width="200"/>
-    
-    
-    <text
-     follows="left|top|right"
-     font="SansSerif"
-     layout="topleft"
-     left_delta="-15"
-     name="BHText"
-     top_pad="15"
-     width="215">
-        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="WaterWave1DirX"
-     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="WaterWave1DirY"
-     top_pad="5"
-     width="216"/>
-    
-<!--======== II conlumn of controls ========-->    
-    
-    <text
-     follows="left|top|right"
-     font="SansSerif"
-     height="10"
-     layout="topleft"
-     left_pad="20"
-     name="BDensText"
-     top="5"
-     width="215">
-        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="215">
-        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="215">
-        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="215">
-         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="16"
-      layout="topleft"
-      left_pad="20"
-      name="DensMultText"
-      top="5"
-      width="215">
-         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="5"
-      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="215">
-         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="5"
-      width="200"/>
-     
-     <text
-      follows="left|top|right"
-      font="SansSerif"
-      height="16"
-      layout="topleft"
-      left_delta="-15"
-      name="MaxAltText"
-      top_pad="15"
-      width="215">
-         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="5"
-      width="200"/>
-      
-      <text
-       follows="left|top|right"
-       font="SansSerif"
-       height="16"
-       layout="topleft"
-       left_delta="-15"
-       name="BHText3"
-       top_pad="15"
-       width="215">
-          Normal Map
-      </text>
-      <texture_picker
-       height="80"
-       layout="topleft"
-       left_delta="15"
-       name="WaterNormalMap"
-       top_pad="5"
-       width="100" />
-	</panel>
-<!--======== End of Controls panel ========-->	
-
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="0"
-     layout="topleft"
-     left="10"
-     name="horiz_separator"
-     top_pad="5"
-     width="700"/>
-	<check_box
-	 follows="top|left"
-	 height="10"
-	 label="Make this preset my new water setting"
-	 layout="topleft"
-	 left="275"
-	 name="make_default_cb"
-	 top_pad="20"
-	 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/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 458e127d41..730661c55b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -713,6 +713,8 @@
 	     	</menu_item_call>
 	     	
 	     	<menu_item_separator/>
+
+           <!-- *LAPRAS* These menus go away.  Keep till no longer needed -->
 	     	
 	     	<menu
 	     	 name="Water Presets"
@@ -732,7 +734,7 @@
 	     	 	 	parameter="edit_water"/>
 	     	 	</menu_item_call>
 	     	</menu>
-	     	
+
 	     	<menu
 	     	 name="Sky Presets"
 	     	 label="Sky Presets">
@@ -770,6 +772,7 @@
 	     	 	 	parameter="edit_day_cycle"/>
 	     	 	</menu_item_call>
 	     	</menu>
+        <!-- *LAPRAS* -->
 	    </menu>
     
     
-- 
cgit v1.2.3