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

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

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

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

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


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

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

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

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


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

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

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

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


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

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

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

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


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

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

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

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


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

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

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

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


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

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

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

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


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

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

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

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


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

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

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

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


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

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

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

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


From 9bfae21706288802f94d642eb252ac78b4d9e85c Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Mon, 2 May 2011 16:35:55 -0700
Subject: ER-858: Add viewer checkbox to toggle parcel privacy settings. 
 Reviewed by Kelly

---
 .../newview/skins/default/xui/en/floater_about_land.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 6e985e0476..d2567e8197 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1204,6 +1204,10 @@ Only large parcels can be listed in search.
              name="push_restrict_region_text">
                 No Pushing (Region Override)
             </panel.string>
+            <panel.string
+             name="private_parcel_text">
+                Private Parcel
+            </panel.string>
             <text
              type="string"
              length="1"
@@ -1333,7 +1337,7 @@ Only large parcels can be listed in search.
              name="check safe"
              tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."
              top_pad="5"
-             width="200" />
+             width="280" />
             <check_box
              height="16"
              label="No Pushing"
@@ -1350,7 +1354,16 @@ Only large parcels can be listed in search.
              left="14"
              name="ShowDirectoryCheck"
              tool_tip="Let people see this parcel in search results"
-             width="430" />
+             width="280" />
+            <check_box
+             height="16"
+             label="Private Parcel"
+             layout="topleft"
+             left_pad="5"
+             name="PrivateParcelCheck"
+             tool_tip="Prevents avatars from seeing into or out of the parcel."
+             top_delta="0"
+             width="119" />
             <combo_box
              enabled="false"
              height="23"
-- 
cgit v1.2.3


From b43da6721e538290962cafa7ddd32a8f4c7e21db Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Fri, 6 May 2011 18:29:43 -0700
Subject: Viewer UI work to add icons for the nav bar and places profile to
 indicate parcel privacy settings.  Using engineering art icons.

---
 .../textures/icons/Parcel_PrivacyOff_Dark.png      | Bin 0 -> 787 bytes
 .../textures/icons/Parcel_PrivacyOn_Dark.png       | Bin 0 -> 833 bytes
 indra/newview/skins/default/textures/textures.xml  |   4 ++-
 .../newview/skins/default/xui/en/notifications.xml |  11 +++++++
 .../skins/default/xui/en/panel_place_profile.xml   |  33 +++++++++++++++++++++
 .../skins/default/xui/en/panel_topinfo_bar.xml     |  10 +++++++
 indra/newview/skins/default/xui/en/strings.xml     |   1 +
 .../default/xui/en/widgets/location_input.xml      |   9 ++++++
 8 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png

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

diff --git a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png
new file mode 100644
index 0000000000..5f9fba4447
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png
new file mode 100644
index 0000000000..ad93163a85
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1ca48b01a8..93dab65bcd 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1,4 +1,4 @@
-<!--
+<!--
 This file contains metadata about how to load, display, and scale textures for rendering in the UI.
 Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer
 to them by filename (relative to textures directory).
@@ -348,6 +348,8 @@ with the same filename but different name
  <texture name="Parcel_ScriptsNo_Dark" file_name="icons/Parcel_ScriptsNo_Dark.png" preload="false" />
  <texture name="Parcel_Voice_Dark" file_name="icons/Parcel_Voice_Dark.png" preload="false" />
  <texture name="Parcel_VoiceNo_Dark" file_name="icons/Parcel_VoiceNo_Dark.png" preload="false" />
+ <texture name="Parcel_PrivacyOff_Dark" file_name="icons/Parcel_PrivacyOff_Dark.png" preload="false" />
+ <texture name="Parcel_PrivacyOn_Dark" file_name="icons/Parcel_PrivacyOn_Dark.png" preload="false" />
 
  <texture name="Parcel_BuildNo_Light" file_name="icons/Parcel_BuildNo_Light.png" preload="false" />
  <texture name="Parcel_FlyNo_Light" file_name="icons/Parcel_FlyNo_Light.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3fb3717e68..c865347304 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5627,6 +5627,17 @@ This area has voice chat disabled. You won&apos;t be able to hear anyone talking
 This area has building disabled. You can&apos;t build or rez objects here.
   </notification>
 
+  <notification
+   icon="privacy.tga"
+   name="PrivateParcel"
+   persist="true"
+   type="notify"
+   unique="true">
+This is a private parcel.   You can&apos;t see 
+others outside the parcel, and those 
+outside are not able to see you.
+  </notification>
+
   <notification
    icon="notify.tga"
    name="ScriptsStopped"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 7e89860c60..66be6701fb 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -153,6 +153,14 @@
      name="icon_DamageNo"
      translate="false"
      value="Parcel_DamageNo_Dark" />
+    <string
+     name="icon_PrivacyOff"
+     translate="false"
+     value="Parcel_PrivacyOff_Dark" />
+    <string
+     name="icon_PrivacyOn"
+     translate="false"
+     value="Parcel_PrivacyOn_Dark" />
     <button
      follows="top|left"
      height="24"
@@ -543,6 +551,31 @@
                          top_delta="0"
                          value="Off"
                          width="60" />
+                        <icon
+                         follows="top|left"
+                         height="18"
+                         image_name="Parcel_PrivacyOff_Dark"
+                         layout="topleft"
+                         left="10"
+                         name="privacy_icon"
+                         top_pad="7"
+                         width="22" />
+                        <text
+                         follows="left|top"
+                         height="14"
+                         layout="topleft"
+                         left_pad="8"
+                         name="privacy_label"
+                         value="Privacy:"
+                         width="90" />
+                        <text
+                         follows="left|top"
+                         height="14"
+                         layout="topleft"
+                         left_pad="0"
+                         name="privacy_value"
+                         value="Off"
+                         width="60" />
                         <button
                          follows="bottom|right"
                          height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
index 30d3064e14..98cb17bbce 100644
--- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
@@ -88,6 +88,16 @@
     visible="false"
     width="14"
     />
+  <icon
+    follows="right|top"
+    height="13"
+    image_name="Parcel_PrivacyOff_Dark"
+    left="2"
+    name="privacy_icon"
+    top="3"
+    visible="false"
+    width="14"
+    />
   <text
     follows="right|top"
     font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b0ede60fa0..6658d6f683 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3043,6 +3043,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlAdultIconTooltip">Adult Region</string>
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
+  <string name="LocationCtrlPrivacyTooltip">Private Parcel</string>
 
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 37d60f1671..c818cdfaeb 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -123,6 +123,15 @@
 	font="SansSerifSmall"
 	text_color="TextFgColor"
 	/>
+  <privacy_icon
+    name="privacy_icon"
+    width="14"
+    height="13"
+    top="19"
+    left="2"
+    follows="right|top"
+    image_name="Parcel_PrivacyOn_Dark"
+    />
   <combo_button
 		name="Location History"
                 label=""
-- 
cgit v1.2.3


From b55d678f8da105aa02d913abcbf66fc9bd167363 Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Mon, 9 May 2011 11:00:54 -0700
Subject: Clean up parcel privacy icons and locations

---
 .../default/textures/icons/Parcel_PrivacyOff_Dark.png   | Bin 787 -> 730 bytes
 .../default/textures/icons/Parcel_PrivacyOn_Dark.png    | Bin 833 -> 814 bytes
 .../skins/default/xui/en/widgets/location_input.xml     |   7 +++----
 3 files changed, 3 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png
index 5f9fba4447..8b3376e514 100644
Binary files a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png and b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png
index ad93163a85..4e474d7f5a 100644
Binary files a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png and b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png differ
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index c818cdfaeb..5a60576b4a 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -125,10 +125,9 @@
 	/>
   <privacy_icon
     name="privacy_icon"
-    width="14"
-    height="13"
-    top="19"
-    left="2"
+    width="22"
+    height="18"
+    top="21"
     follows="right|top"
     image_name="Parcel_PrivacyOn_Dark"
     />
-- 
cgit v1.2.3


From 5e0fee32074643454ae3c947eae648c6333d7f48 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 12 May 2011 21:17:10 +0300
Subject: STORM-1243 WIP Fixed a typo in notifications.xml which might lead to
 numerous notification handling errors.

The typo was introduced in changeset 437f3d892bfd.
---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 28dcae41c5..2e0f3d9cdc 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6905,7 +6905,7 @@ Deed to group failed.
    name="ReleaseLandThrottled"
    type="notifytip">
 The parcel [PARCEL_NAME] can not be abandoned at this time.
-   tag>fail</tag>
+   <tag>fail</tag>
   </notification>
 	
   <notification
-- 
cgit v1.2.3


From 2d19b297a98d8be87c487f6b93e098dce9ca908c Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 13 May 2011 18:23:11 +0300
Subject: STORM-1202 FIXED Time spin control

Implemented time spin control which is like spin control, but shows and allows to edit time string in "hh:mm PM/AM" format.
Implemented according to the WLRS spec.
---
 indra/newview/skins/default/xui/en/widgets/time.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/time.xml

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

diff --git a/indra/newview/skins/default/xui/en/widgets/time.xml b/indra/newview/skins/default/xui/en/widgets/time.xml
new file mode 100644
index 0000000000..b5bdd564a6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/time.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<time text_enabled_color="LabelTextColor"
+         text_disabled_color="LabelDisabledColor"
+         font="SansSerifSmall"
+         label_width="40" >
+  <time.up_button name="SpinCtrl Up"
+                     image_unselected="Stepper_Up_Off"
+                     image_selected="Stepper_Up_Press"
+                     tab_stop="false"
+                     follows="left|bottom" />
+  <time.down_button name="SpinCtrl Down"
+                       image_unselected="Stepper_Down_Off"
+                       image_selected="Stepper_Down_Press"
+                       tab_stop="false"
+                       follows="left|bottom" />
+</time>
-- 
cgit v1.2.3


From ff3289e2f3a8e87ce33cb267ad30b4a431406f9e Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Fri, 13 May 2011 13:56:49 -0700
Subject: ER-898: Modify llGetParcelDetails() on viewer to support parcel
 privacy.  Reviewed by Kelly.

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 6658d6f683..92a2296740 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1683,7 +1683,7 @@ Returns the maximum number of prims allowed on the parcel at pos
 	<string name="LSLTipText_llGetParcelDetails" translate="false">
 list llGetParcelDetails(vector pos, list params)
 Returns the parcel details specified in params for the parcel at pos.
-Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA
+Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _PRIVACY
 	</string>
 	<string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
 llSetLinkPrimitiveParams(integer linknumber, list rules)
-- 
cgit v1.2.3


From cccca566bd2365c88cca819729c5432af9dfa52f Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Mon, 16 May 2011 17:17:01 +0300
Subject: STORM-1245 WIP Reimplementing management of local presets according
 to the new spec.

User environment preferences are now persistent.

TODO: Implement applying region env. settings.
---
 indra/newview/skins/default/xui/en/menu_viewer.xml   |  3 ++-
 indra/newview/skins/default/xui/en/notifications.xml | 11 -----------
 2 files changed, 2 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 910106a6b5..04a0350283 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -505,8 +505,9 @@
                  function="World.EnvSettings"
                  parameter="midnight" />
             </menu_item_call>
+            <menu_item_separator/>
             <menu_item_call
-             label="Estate Time"
+             label="Use Region Sun"
              name="Revert to Region Default">
                 <menu_item_call.on_click
                  function="World.EnvSettings"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2e0f3d9cdc..3c8daec68a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4862,17 +4862,6 @@ This day cycle file references a missing sky file: [SKY].
 Sorry, the settings couldn't be applied to the region.  Leaving the region and then returning may help rectify the problem.  The reason given was: [FAIL_REASON]
   </notification>
 
-  <notification
-   functor="GenericAcknowledge"
-   icon="alertmodal.tga"
-   name="EnvLockedUsingRegion"
-   type="alertmodal">
-You cannot load environment presets while you are using the region's environment settings.  To manually configure your environment setings, select the Environment Editor and uncheck "Use Region Environment Settings."
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
   <notification
    functor="GenericAcknowledge"
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From 6bafd98ae0b12878cb265645190fc46c919773d3 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 16 May 2011 17:17:56 -0700
Subject: initial sidepanel inventory xml changes

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 87 +++++++++++++++++++---
 1 file changed, 76 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 8997c1a6d7..5f6ef16cf0 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -19,17 +19,82 @@
 		 height="570"
 		 visible="true"
 		 width="330">
-		<panel
-			 class="panel_main_inventory"
-			 filename="panel_main_inventory.xml"
-			 follows="all"
-			 layout="topleft"
-			 left="0"
-			 name="panel_main_inventory"
-			 top="0"
-			 label=""
-			 height="545"
-			 width="330" />
+         <layout_stack
+              follows="left|right|top|bottom"
+              layout="topleft"
+              left="0"
+              top="0"
+              orientation="vertical"
+              name="inventory_layout_stack"
+              height="545"
+              width="330">
+             <layout_panel>
+                 <panel
+                      class="panel_main_inventory"
+                      filename="panel_main_inventory.xml"
+                      follows="all"
+                      layout="topleft"
+                      left="0"
+                      name="panel_main_inventory"
+                      top="0"
+                      label=""
+                      height="445"
+                      width="330" />
+             </layout_panel>
+             <layout_panel
+                 width="330"
+                  follows="bottom|left|right"
+                 height="100">
+                 <accordion
+                   follows="all"
+                   fit_parent="true"
+                   height="100"
+                   left="10"
+                   single_expansion="true"
+                   top="0"
+                   name="accordion"
+                   background_visible="true"
+                   bg_alpha_color="DkGray2"
+                   width="311">
+                     <accordion_tab
+                      name="tab_clothing"
+                      height="35"
+                      title="MARKETPLACE INBOX">
+                         <flat_list_view
+                          allow_select="true"
+                          follows="all"
+                          height="30"
+                          item_pad="3"
+                          keep_selection_visible_on_reshape="false"
+                          layout="topleft"
+                          left="0"
+                          multi_select="true"
+                          name="list_clothing"
+                          top="0"
+                          width="311" />
+                     </accordion_tab>
+                     <accordion_tab
+                      name="tab_attachments"
+                      title="MARKETPLACE OUTBOX">
+                         <flat_list_view
+                          allow_select="true"
+                          follows="all"
+                          height="30"
+                          item_pad="3"
+                          layout="topleft"
+                          left="0"
+                          keep_selection_visible_on_reshape="false"
+                          multi_select="true"
+                          name="list_attachments"
+                          top="0"
+                          width="311">
+                             <flat_list_view.no_items_text
+                              value="No attachments worn" />
+                         </flat_list_view>
+                     </accordion_tab>
+                 </accordion>
+             </layout_panel>
+         </layout_stack>
 		<panel
 		     follows="bottom|left|right"
 			 height="25"
-- 
cgit v1.2.3


From 3d0688da9461766d783383d68a990fcf8711228e Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Tue, 17 May 2011 16:27:09 +0300
Subject: STORM-1205 ADDITIONAL FIX Add "Environment" tab to the
 "Region/Estate" floater

- Set tab Environment to the right place (tab order) in the Region\Estate floater

- Updated Environment tab content according the spec
---
 .../skins/default/xui/en/floater_region_info.xml   | 151 +--------------------
 .../default/xui/en/panel_region_environment.xml    | 140 +++++++++++++++++++
 2 files changed, 141 insertions(+), 150 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_region_environment.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index 017c70cf49..3b58cd08f6 100644
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
@@ -16,154 +16,5 @@
      name="region_panels"
      right="-1"
      tab_position="top"
-     top="20">
-     
-     <!-- Temporary panel. It will be deleted from this xml. It'll be added the same way as others tab panels -->
-    <panel
-     border="true"
-     bevel_style="none"
-	 follows="top|left"
-	 height="320"
-	 label="Emvironment"
-	 layout="topleft"
-	 left="0"
-	 name="environment_tab"
-	 width="4250">
-	 
-	 <!-- Water Settings --> 
-	 <view_border
-	  bevel_style="none"  
-	  follows="top|left"
-	  height="100"
-	  layout="topleft"
-	  left="50"
-	  name="water_panel"
-	  top="50"
-	  width="430"/> 
-	 <text
-	  name="water_settings_title"
-	  follows="top|left"
-	  height="16"
-	  layout="topleft"
-	  left_delta="5"
-	  top_delta="5"
-	  width="35">
-	  		Water
-	  </text>
-	  
-	  <radio_group
-	   follows="top|left"
-	   height="45"
-	   layout="topleft"
-	   name="water_settings_radio_group"   
-	   top_pad="20"
-	   width="200">
-	  	<radio_item  	 
-	  	 label="Use region settings"
-	  	 layout="topleft"
-	  	 name="region_water_settings"/>
-	  	<radio_item  	 
-	  	 label="Use my settings"
-	  	 layout="topleft"
-	  	 name="my_water_settings"
-	  	 top_pad="20"/>  	
-	  </radio_group>
-	  <combo_box
-	   follows="top|left"
-	   left_pad="2"
-	   name="water_settings_preset_combo"
-	   top_delta="24"
-	   width="200">
-	  </combo_box>
-	 
-	 
-	 <!-- Sky/Day Cycle Settings -->  
-	 <view_border
-	  bevel_style="none"  
-	  follows="top|left"
-	  height="180"
-	  layout="topleft"
-	  left="50"
-	  name="sky_dayc_panel"
-	  top="175"
-	  width="430"/> 
-	 <text
-	  name="sky_dayc_settings_title"
-	  follows="top|left"
-	  height="16"
-	  layout="topleft"
-	  left="55"
-	  top_delta="5"
-	  width="100">
-	  		Sky / Day Cycle
-	  </text>
-	  
-	  <radio_group
-	   follows="top|left"
-	   height="45"
-	   layout="topleft"
-	   name="sky_dayc_settings_radio_group1"
-	   top_pad="20"
-	   width="200">
-	  	<radio_item
-	  	 layout="topleft"
-	  	 label="Use region settings"
-	  	 name="region_sky_dayc_settings"/>
-	  	<radio_item
-	  	 layout="topleft"
-	  	 label="Use my settings"
-	  	 name="my_sky_dayc_settings"
-	  	 top_pad="20"/>  	
-	  </radio_group>
-	  
-	  <radio_group
-	   layout="topleft"
-	   left_delta="50"
-	   name="sky_dayc_settings_radio_group2"
-	   top_pad="10"
-	   height="50"
-	   width="150">
-	  	<radio_item
-	  	 layout="topleft"
-	  	 label="Fixed sky"
-	  	 name="my_sky_settings"/>
-	  	<radio_item
-	  	 layout="topleft"
-	  	 label="Day cycle"
-	  	 name="my_dayc_settings"
-	  	 top_pad="25"/>  	
-	  </radio_group>
-	  <combo_box
-	   follows="top|left"
-	   left_pad="2"
-	   name="sky_settings_preset_combo"
-	   top_delta="-7"
-	   width="200">
-	  </combo_box>
-	    <combo_box
-	   follows="top|left"
-	   name="dayc_settings_preset_combo"
-	   top_delta="36"
-	   width="200">
-	  </combo_box>
-	  
-	  <button
-	   follows="bottom|right"
-	   height="23"
-	   label="Save"
-	   layout="topleft"
-	   left_pad="0"
-	   name="save"
-	   width="70"/>	 
-	 <button
-	   follows="bottom|right"
-	   height="23"
-	   label="Cancel"
-	   layout="topleft"
-	   left_pad="15"
-	   name="cancel"
-	   width="70"/>
-     </panel>
-     
-     </tab_container>
+     top="20"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
new file mode 100644
index 0000000000..907a707db8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel
+ follows="top|left"
+ height="300"
+ label="Environment"
+ layout="topleft"
+ name="panel_env_info"
+ width="530"> 
+ <text
+  name="water_settings_title"
+  follows="top|left"
+  height="30"
+  layout="topleft"
+  left="50"
+  top_pad="20"
+  width="430"
+  wrap="true">
+  Select the Water and Sky/Day Cycle Settings you would like all visitors to your region to see.  More info
+ </text> 
+ <view_border
+  bevel_style="none"
+  follows="top|left"
+  height="237"
+  layout="topleft"
+  left="50"
+  name="border"
+  top="60"
+  width="430"/>
+ <radio_group
+  follows="top|left"
+  height="45"
+  layout="topleft"
+  left_delta="10"
+  name="region_settings_radio_group"
+  top_delta="20"
+  width="200">
+  <radio_item
+   label="Use Second Life default"
+   layout="topleft"
+   name="use_sl_default_settings"/>
+  <radio_item
+   label="Use my settings"
+   layout="topleft"
+   name="use_my_settings"
+   top_pad="20"/>
+  </radio_group>
+ <panel
+  follows="top|left"
+  height="170"
+  layout="topleft"
+  left="50"
+  name="user_environment_settings"
+  top_pad="20"
+  width="430">
+   <text
+    name="water_settings_title"
+    follows="top|left"
+    height="16"
+    layout="topleft"
+    left="50"
+    top_pad="0"
+    width="160">
+    Water Setting
+   </text>
+   <combo_box
+    follows="top|left"
+    left_pad="2"
+    name="water_settings_preset_combo"
+    top_delta="-7"
+    width="200">
+    <combo_box.item
+     label="-Select a preset-"
+     name="item0"/>
+   </combo_box>
+   <text
+    name="sky_dayc_settings_title"
+    follows="top|left"
+    height="16"
+    layout="topleft"
+    left="50"
+    top_pad="30"
+    width="100">
+    Sky / Day Cycle
+   </text>
+   <radio_group
+    layout="topleft"
+    left_delta="50"
+    name="sky_dayc_settings_radio_group"
+    top_pad="10"
+    height="50"
+    width="110">
+    <radio_item
+     layout="topleft"
+     label="Fixed sky"
+     name="my_sky_settings"/>
+    <radio_item
+     layout="topleft"
+     label="Day cycle"
+     name="my_dayc_settings"
+     top_pad="25"/>  	
+    </radio_group>
+   <combo_box
+    follows="top|left"
+    left_pad="2"
+    name="sky_settings_preset_combo"
+    top_delta="-7"
+    width="200">
+    <combo_box.item
+     label="-Select a preset-"
+     name="item0"/>
+   </combo_box>
+   <combo_box
+    follows="top|left"
+    name="dayc_settings_preset_combo"
+    top_delta="36"
+    width="200">
+    <combo_box.item
+     label="-Select a preset-"
+     name="item0"/>
+   </combo_box>
+ </panel>
+ <button
+  follows="left|top"
+  height="23"
+  label="Save"
+  layout="topleft"
+  right="-160"
+  name="save_btn"
+  top_pad="150"
+  width="100" />
+ <button
+  follows="left|top"
+  height="23"
+  label="Cancel"
+  layout="topleft"
+  left_pad="10"
+  name="cancel_btn"
+  width="100" /> 
+</panel>
-- 
cgit v1.2.3


From ec749bb1c1fa143c6019791d6713d85f05510e53 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Tue, 17 May 2011 17:09:15 +0300
Subject: STORM-1244 FIXED Environment Settings floater implementation.

---
 .../xui/en/floater_environment_settings.xml        | 131 ++++++++++-----------
 indra/newview/skins/default/xui/en/menu_viewer.xml |  32 ++---
 2 files changed, 72 insertions(+), 91 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
index 77cad2a2bd..8460530f97 100644
--- a/indra/newview/skins/default/xui/en/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="400"
+ height="350"
  layout="topleft"
  name="Environment Editor Floater"
  help_topic="environment_editor_floater"
@@ -9,100 +9,80 @@
  title="ENVIRONMENT EDITOR"
  width="600">
  
- <!-- Water Settings -->
  <view_border
   bevel_style="none"  
   follows="top|left"
-  height="100"
+  height="237"
   layout="topleft"
   left="50"
-  name="water_panel"
+  name="border"
   top="50"
-  width="500"/> 
- <text
-  name="water_settings_title"
+  width="500"/>  
+ <radio_group
   follows="top|left"
-  height="16"
+  height="45"
   layout="topleft"
-  left_delta="5"
-  top_delta="5"
-  width="35">
-  		Water
-  </text>
-  
-  <radio_group
-   follows="top|left"
-   height="45"
-   layout="topleft"
-   name="water_settings_radio_group"   
-   top_pad="20"
-   width="200">
-  	<radio_item  	 
+  left_delta="10"
+  name="region_settings_radio_group"
+  top_delta="20"
+  width="200">
+    <radio_item
   	 label="Use region settings"
   	 layout="topleft"
-  	 name="region_water_settings"/>
-  	<radio_item  	 
+  	 name="use_region_settings"/>
+    <radio_item
   	 label="Use my settings"
   	 layout="topleft"
-  	 name="my_water_settings"
-  	 top_pad="20"/>  	
+  	 name="use_my_settings"
+  	 top_pad="20"/>
   </radio_group>
+
+ <panel
+  height="170"
+  layout="topleft"
+  left="50"
+  name="user_environment_settings"
+  top_pad="0"
+  width="500">
+
+ <!-- Water Setting -->
+ <text
+  name="water_settings_title"
+  follows="top|left"
+  height="16"
+  layout="topleft"
+  left="50"
+  top_pad="30"
+  width="200">
+  		Water Setting
+  </text>
   <combo_box
    follows="top|left"
    left_pad="2"
    name="water_settings_preset_combo"
-   top_delta="24"
+   top_delta="-7"
    width="200">
       <combo_box.item
        label="-Select a preset-"
-       name="item0"
-       value="any" />
+       name="item0"/>
   </combo_box>
  
- 
+
  <!-- Sky/Day Cycle Settings -->  
- <view_border
-  bevel_style="none"  
-  follows="top|left"
-  height="180"
-  layout="topleft"
-  left="50"
-  name="sky_dayc_panel"
-  top="175"
-  width="500"/> 
  <text
   name="sky_dayc_settings_title"
   follows="top|left"
   height="16"
   layout="topleft"
-  left="55"
-  top_delta="5"
+  left="50"
+  top_pad="30"
   width="100">
   		Sky / Day Cycle
   </text>
-  
-  <radio_group
-   follows="top|left"
-   height="45"
-   layout="topleft"
-   name="sky_dayc_settings_radio_group1"
-   top_pad="20"
-   width="200">
-  	<radio_item
-  	 layout="topleft"
-  	 label="Use region settings"
-  	 name="region_sky_dayc_settings"/>
-  	<radio_item
-  	 layout="topleft"
-  	 label="Use my settings"
-  	 name="my_sky_dayc_settings"
-  	 top_pad="20"/>  	
-  </radio_group>
-  
   <radio_group
    layout="topleft"
    left_delta="50"
-   name="sky_dayc_settings_radio_group2"
+   name="sky_dayc_settings_radio_group"
    top_pad="10"
    height="50"
    width="150">
@@ -124,17 +104,34 @@
    width="200">
       <combo_box.item
        label="-Select a preset-"
-       name="item0"
-       value="any" />
+       name="item0"/>
   </combo_box>
-    <combo_box
+  <combo_box
    follows="top|left"
    name="dayc_settings_preset_combo"
    top_delta="36"
    width="200">
       <combo_box.item
        label="-Select a preset-"
-       name="item0"
-       value="any" />
-  </combo_box>		
+       name="item0"/>
+  </combo_box>
+  </panel>
+
+  <button
+   follows="left|top"
+   height="23"
+   label="OK"
+   layout="topleft"
+   right="-160"
+   name="ok_btn"
+   top_pad="20"
+   width="100" />
+  <button
+   follows="left|top"
+   height="23"
+   label="Cancel"
+   layout="topleft"
+   left_pad="10"
+   name="cancel_btn"
+   width="100" />	
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 04a0350283..38bffd04ed 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -505,31 +505,7 @@
                  function="World.EnvSettings"
                  parameter="midnight" />
             </menu_item_call>
-            <menu_item_separator/>
-            <menu_item_call
-             label="Use Region Sun"
-             name="Revert to Region Default">
-                <menu_item_call.on_click
-                 function="World.EnvSettings"
-                 parameter="default" />
-            </menu_item_call>
         </menu>
-	    <menu
-	     create_jump_keys="true"
-	     label="Edit My Environment"
-	     name="Environment"
-	     tear_off="true">
-            <menu_item_check
-             label="Use Region Settings"
-             name="Use Region Settings">
-                <on_check
-                 function="World.CheckEnvironment"
-                 parameter="use_region_settings" />
-                <on_click
-                 function="World.Environment"
-                 parameter="use_region_settings" />
-            </menu_item_check>
-	    </menu>
 	    
    
 	    <menu
@@ -546,6 +522,14 @@
                  parameter="editor"/>
 	     	</menu_item_call>
 	     	
+	        <menu_item_call
+	     	 label="Enviroment Settings (old)"
+	     	 name="Enviroment Settings (old)">
+	     	 	<menu_item_call.on_click
+	     	 	 function="World.EnvSettings"
+                 parameter="old_editor"/>
+	     	</menu_item_call>
+	     	
 	     	<menu_item_separator/>
 	     	
 	     	<menu
-- 
cgit v1.2.3


From 4a882c82dcc236b9154087cdd886d3dd076099c9 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Tue, 17 May 2011 18:16:16 +0300
Subject: STORM-1196 ADDITIONAL FIX Mockup: Environment Settings floater

- Decreased a little bit size of the Environment Settings floater
---
 .../newview/skins/default/xui/en/floater_environment_settings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
index 8460530f97..48c8bc75d1 100644
--- a/indra/newview/skins/default/xui/en/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="350"
+ height="338"
  layout="topleft"
  name="Environment Editor Floater"
  help_topic="environment_editor_floater"
  save_rect="true"
  title="ENVIRONMENT EDITOR"
- width="600">
+ width="540">
  
  <view_border
   bevel_style="none"  
   follows="top|left"
   height="237"
   layout="topleft"
-  left="50"
+  left="20"
   name="border"
-  top="50"
+  top="38"
   width="500"/>  
  <radio_group
   follows="top|left"
-- 
cgit v1.2.3


From dfebb9ebb7333387d59aa7ba4e5926671d6681f5 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 17 May 2011 16:01:29 -0700
Subject: hooking up the marketplace inventory panel to the class

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 60 +++++++++++-----------
 1 file changed, 31 insertions(+), 29 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 5f6ef16cf0..faf5e28bb8 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -28,7 +28,10 @@
               name="inventory_layout_stack"
               height="545"
               width="330">
-             <layout_panel>
+             <layout_panel
+                 width="330"
+                  follows="bottom|left|right"
+                 height="445">
                  <panel
                       class="panel_main_inventory"
                       filename="panel_main_inventory.xml"
@@ -45,6 +48,16 @@
                  width="330"
                   follows="bottom|left|right"
                  height="100">
+                 <panel
+                      class="panel_marketplace_inventory"
+                      follows="all"
+                      layout="topleft"
+                      left="0"
+                      name="panel_marketplace"
+                      top="0"
+                      label=""
+                      height="100"
+                      width="330">
                  <accordion
                    follows="all"
                    fit_parent="true"
@@ -58,41 +71,30 @@
                    width="311">
                      <accordion_tab
                       name="tab_clothing"
-                      height="35"
+                      height="35" 
+                      min_height="150"
+                      fit_panel="false"
                       title="MARKETPLACE INBOX">
-                         <flat_list_view
-                          allow_select="true"
-                          follows="all"
-                          height="30"
-                          item_pad="3"
-                          keep_selection_visible_on_reshape="false"
-                          layout="topleft"
-                          left="0"
-                          multi_select="true"
-                          name="list_clothing"
-                          top="0"
-                          width="311" />
+                        <view
+                            follows="all"
+                            left="0"
+                            height="40"
+                            top="0"
+                           />
                      </accordion_tab>
                      <accordion_tab
                       name="tab_attachments"
+                      fit_panel="false"
                       title="MARKETPLACE OUTBOX">
-                         <flat_list_view
-                          allow_select="true"
-                          follows="all"
-                          height="30"
-                          item_pad="3"
-                          layout="topleft"
-                          left="0"
-                          keep_selection_visible_on_reshape="false"
-                          multi_select="true"
-                          name="list_attachments"
-                          top="0"
-                          width="311">
-                             <flat_list_view.no_items_text
-                              value="No attachments worn" />
-                         </flat_list_view>
+                         <view
+                           follows="all"
+                           height="35"
+                           left="0"
+                           top="0"
+                           />
                      </accordion_tab>
                  </accordion>
+                 </panel>
              </layout_panel>
          </layout_stack>
 		<panel
-- 
cgit v1.2.3


From 03dca7cb7e578d20ec07298cecc47e0ae67aaaf5 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 17 May 2011 16:38:51 -0700
Subject: fixing llaccordian crash with multiple child panels

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 35 ++++++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index faf5e28bb8..41b9283edc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -75,12 +75,35 @@
                       min_height="150"
                       fit_panel="false"
                       title="MARKETPLACE INBOX">
-                        <view
-                            follows="all"
-                            left="0"
-                            height="40"
-                            top="0"
-                           />
+                         <panel
+                             follows="all"
+                             left="0"
+                             height="40"
+                             width="250"
+                             top="0"
+                           >
+                             <text
+                                 left ="40"
+                                 top="15"
+                                 height="14"
+                                 width="100"
+                                 >Just a panel</text>    
+                         </panel>
+                         <panel
+                     follows="all"
+                     left="0"
+                     height="40"
+                             visible="false"
+                     width="250"
+                     top="0"
+                           >
+                             <text
+                                 left ="40"
+                                 top="15"
+                                 height="14"
+                                 width="100"
+                                 >Just a panel 2</text>
+                         </panel>
                      </accordion_tab>
                      <accordion_tab
                       name="tab_attachments"
-- 
cgit v1.2.3


From a2bb4139dc9a10e29e794a7b862b5d5870b0f9d4 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 19 May 2011 18:20:46 -0400
Subject: STORM-1265: XUI changes for merging the Terrain and Ground Textures
 tabs (code not working yet)

---
 .../skins/default/xui/en/panel_region_terrain.xml  | 384 +++++++++++++++------
 1 file changed, 272 insertions(+), 112 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index fb94423a5c..bbb8b40594 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="top|left"
- height="400"
+ height="460"
  help_topic="panel_region_terrain_tab"
  label="Terrain"
  layout="topleft"
@@ -50,10 +50,10 @@
      label="Terrain Raise Limit"
      label_width="120"
      layout="topleft"
-     left="15"
+     left="240"
      max_val="100"
      name="terrain_raise_spin"
-     top="60"
+     top="40"
      width="180" />
     <spinner
      follows="left|top"
@@ -62,148 +62,299 @@
      label="Terrain Lower Limit"
      label_width="120"
      layout="topleft"
-     left="15"
+     left="240"
      max_val="0"
      min_val="-100"
      name="terrain_lower_spin"
-     top="80"
+     top="60"
      width="180" />
-    <check_box
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="60"
+     layout="topleft"
+     left="8"
+     top="30"
+     width="460" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
      height="20"
-     label="Use Estate Sun"
      layout="topleft"
-     left="250"
-     name="use_estate_sun_check"
-     top="35"
+     left="10"
+     name="detail_texture_text"
+     top="110"
+     width="300">
+        Terrain Textures (requires 512x512, 24 bit .tga files)
+    </text>
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_delta="0"
+     name="texture_detail_0"
+     top_delta="20"
      width="100" />
-    <check_box
-     height="20"
-     label="Fixed Sun"
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_pad="10"
+     name="texture_detail_1"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_pad="10"
+     name="texture_detail_2"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     follows="left|top"
+     height="100"
      layout="topleft"
-     left="250"
-     name="fixed_sun_check"
-     top="55"
+     left_pad="10"
+     name="texture_detail_3"
+     top_delta="0"
      width="100" />
-    <icon
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
      height="20"
-     image_name="icon_day_cycle.tga"
      layout="topleft"
-     left="285"
-     name="daycycle"
-     top="80"
-     width="165" />
-    <slider
+     left="10"
+     name="height_text_lbl"
+     top_delta="90"
+     width="65">
+        1 (Low)
+    </text>
+    <text
+     type="string"
+     length="1"
      follows="left|top"
      height="20"
-     increment="0.001"
-     label="Phase"
      layout="topleft"
-     left="250"
-     max_val="30"
-     min_val="6"
-     name="sun_hour_slider"
-     show_text="false"
-     top="105"
-     width="200" />
-    <button
-     enabled="false"
+     left_pad="45"
+     name="height_text_lbl2"
+     top_delta="0"
+     width="100">
+        2
+    </text>
+    <text
+     type="string"
+     length="1"
      follows="left|top"
      height="20"
-     label="Apply"
      layout="topleft"
-     left="350"
-     name="apply_btn"
-     top="135"
-     width="90" />
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="130"
+     left_pad="10"
+     name="height_text_lbl3"
+     top_delta="0"
+     width="100">
+        3
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
      layout="topleft"
-     left="8"
-     top="30"
-     width="460" />
+     left_pad="10"
+     name="height_text_lbl4"
+     top_delta="0"
+     width="100">
+        4 (High)
+    </text>
     <text
+     type="string"
+     length="1"
      follows="left|top"
      height="20"
-     left="190"
-     name="wl_settings_label"
-     top_pad="10"
-     width="280">
-     WindLight environment settings for region:
+     layout="topleft"
+     left="10"
+     name="height_text_lbl5"
+     top_delta="30"
+     width="300">
+        Texture Elevation Ranges
     </text>
     <text
      follows="left|top"
-     height="60"
-     left="190"
-     name="wl_settings_unavailable"
-     top_pad="0"
-     visible="false"
-     width="400">
-Not supported by this region, or you do not
-have permission to change the region's settings.
-See &apos;?&apos; for details.
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl10"
+     top_delta="30"
+     width="200"
+     word_wrap="true">
+      These values represent the blend range for the textures above.
     </text>
-    <button
+    <text
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left_delta="0"
+       name="height_text_lbl11"
+       top_delta="32"
+       width="200"
+       word_wrap="true">
+        Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
+    </text>
+    <text
      follows="left|top"
      height="20"
-     label="Use Estate Time"
-     left="190"
-     name="EnvUseEstateTimeButton"
+     layout="topleft"
+     left="270"
+     name="height_text_lbl6"
+     top="250"
+     width="100">
+        Northwest
+    </text>
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl7"
      top_delta="0"
-     width="110" />
-    <button
+     width="100">
+        Northeast
+    </text>
+<!--  northwest low-->
+     <spinner
+      follows="left|top"
+      height="20"
+      increment="0.5"
+      label="Low"
+      label_width="37"
+      layout="topleft"
+      left="230"
+      max_val="500"
+      min_val="-500"
+      name="height_start_spin_1"
+      top_delta="15"
+      width="100" />  
+<!--    northeast low-->
+      <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="Low"
+       label_width="37"
+       layout="topleft"
+       left_pad="10"
+       max_val="500"
+       min_val="-500"
+       name="height_start_spin_3"
+       top_delta="0"
+       width="100" />
+<!--  northwest high-->
+     <spinner
+      follows="left|top"
+      height="20"
+      increment="0.5"
+      label="High"
+      label_width="37"
+      layout="topleft"
+      left="230"
+      max_val="500"
+      min_val="-500"
+      name="height_range_spin_1"
+      top_delta="20"
+      width="100" />
+<!--  northeast high-->
+    <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="High"
+       label_width="37"
+       layout="topleft"
+       left_pad="10"
+       max_val="500"
+       min_val="-500"
+       name="height_range_spin_3"
+       top_delta="0"
+       width="100" />
+    <text
      follows="left|top"
      height="20"
-     label="Advanced Sky"
-     left_delta="0"
-     name="EnvAdvancedSkyButton"
-     top_pad="3"
-     width="110" />
-    <button
+     layout="topleft"
+     left="270"
+     name="height_text_lbl8"
+     top_pad="10"
+     width="100">
+        Southwest
+    </text>
+    <text
      follows="left|top"
      height="20"
-     label="Advanced Water"
-     left_delta="0"
-     name="EnvAdvancedWaterButton"
-     top_pad="3"
-     width="110" />
-    <button
-     enabled="false"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl9"
+     top_delta="0"
+     width="100">
+        Southeast
+    </text>
+<!--  southwest low-->
+    <spinner
      follows="left|top"
      height="20"
-     label="Apply Changes to Region"
-     left="-170"
-     top_delta="-46"
-     name="WLRegionApply"
-     width="160" />
-    <button
-     enabled="false"
+     increment="0.5"
+     label="Low"
+     label_width="37"
+     layout="topleft"
+     left="230"
+     max_val="500"
+     min_val="-500"
+     name="height_start_spin_0"
+     top_delta="15"
+     width="100" />
+<!--  southeast low-->
+    <spinner
      follows="left|top"
      height="20"
-     label="Cancel Changes"
-     left_delta="0"
-     name="WLRegionCancel"
-     top_pad="3"
-     width="160" />
-    <button
-     enabled="false"
+     increment="0.5"
+     label="Low"
+     label_width="37"
+     layout="topleft"
+     left_pad="10"
+     max_val="500"
+     min_val="-500"
+     name="height_start_spin_2"
+     top_delta="0"
+     width="100" />
+<!--southwest high-->
+    <spinner
      follows="left|top"
      height="20"
-     label="Revert Region to Default"
-     left_delta="0"
-     name="WLRegionDefault"
-     top_pad="3"
-     width="160" />
-    <button
-     enabled="false"
+     increment="0.5"
+     label="High"
+     label_width="37"
+     layout="topleft"
+     left="230"
+     max_val="500"
+     min_val="-500"
+     name="height_range_spin_0"
+     top_delta="20"
+     width="100" />
+<!--  southeast high-->
+    <spinner
      follows="left|top"
      height="20"
-     label="Apply Local to Region"
-     left_delta="0"
-     top_pad="3"
-     name="WLCurrentApply"
-     width="160" />
+     increment="0.5"
+     label="High"
+     label_width="37"
+     layout="topleft"
+     left_pad="10"
+     max_val="500"
+     min_val="-500"
+     name="height_range_spin_2"
+     top_delta="0"
+     width="100" />
+<!-- Terrain Download/Upload/Bake buttons -->
     <button
      follows="left|top"
      height="20"
@@ -212,26 +363,35 @@ See &apos;?&apos; for details.
      left="10"
      name="download_raw_btn"
      tool_tip="Available only to estate owners, not managers"
-     top="330"
-     width="170" />
+     top="390"
+     width="160" />
     <button
      follows="left|top"
      height="20"
      label="Upload RAW terrain..."
      layout="topleft"
-     left="10"
+     left_pad="10"
+     top_delta="0"
      name="upload_raw_btn"
      tool_tip="Available only to estate owners, not managers"
-     top_pad="0"
-     width="170" />
+     width="160" />
     <button
      follows="left|top"
      height="20"
      label="Bake Terrain"
      layout="topleft"
-     left="10"
+     left_pad="10"
      name="bake_terrain_btn"
      tool_tip="Set current terrain as mid-point for raise/lower limits"
-     top_pad="3"
+     width="100" />
+    <button
+     enabled="true"
+     follows="left|top"
+     height="20"
+     label="Apply"
+     layout="topleft"
+     left_delta="0"
+     name="apply_btn"
+     top="430"
      width="100" />
 </panel>
-- 
cgit v1.2.3


From 03202e5d4ddd371eb9b5822ef2fd7775fddb7f80 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 19 May 2011 22:50:39 -0400
Subject: STORM-1265: remove region texture tab

---
 .../skins/default/xui/en/panel_region_texture.xml  | 327 ---------------------
 1 file changed, 327 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/panel_region_texture.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
deleted file mode 100644
index 5d910ea659..0000000000
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- follows="top|left"
- height="320"
- help_topic="panel_region_texture_tab"
- label="Ground Textures"
- layout="topleft"
- left="0"
- name="Textures"
- top="320"
- width="480">
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="region_text_lbl"
-     top="10"
-     width="100">
-        Region:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="50"
-     name="region_text"
-     top_delta="0"
-     width="400">
-        unknown
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="detail_texture_text"
-     top="36"
-     width="300">
-        Terrain Textures (requires 512x512, 24 bit .tga files)
-    </text>
-    <texture_picker
-     follows="left|top"
-     height="100"
-     layout="topleft"
-     left_delta="0"
-     name="texture_detail_0"
-     top_delta="20"
-     width="100" />
-    <texture_picker
-     follows="left|top"
-     height="100"
-     layout="topleft"
-     left_pad="10"
-     name="texture_detail_1"
-     top_delta="0"
-     width="100" />
-    <texture_picker
-     follows="left|top"
-     height="100"
-     layout="topleft"
-     left_pad="10"
-     name="texture_detail_2"
-     top_delta="0"
-     width="100" />
-    <texture_picker
-     follows="left|top"
-     height="100"
-     layout="topleft"
-     left_pad="10"
-     name="texture_detail_3"
-     top_delta="0"
-     width="100" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="height_text_lbl"
-     top="146"
-     width="65">
-        1 (Low)
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="45"
-     name="height_text_lbl2"
-     top_delta="0"
-     width="100">
-        2
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl3"
-     top_delta="0"
-     width="100">
-        3
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl4"
-     top_delta="0"
-     width="100">
-        4 (High)
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="height_text_lbl5"
-     top="170"
-     width="300">
-        Texture Elevation Ranges
-    </text>
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="51"
-     name="height_text_lbl6"
-     top="185"
-     width="100">
-        Northwest
-    </text>
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl7"
-     top_delta="0"
-     width="100">
-        Northeast
-    </text>
-<!--  northwest low-->
-     <spinner
-      follows="left|top"
-      height="20"
-      increment="0.5"
-      label="Low"
-      label_width="37"
-      layout="topleft"
-      left="10"
-      max_val="500"
-      min_val="-500"
-      name="height_start_spin_1"
-      top_delta="15"
-      width="100" />  
-<!--    northeast low-->
-      <spinner
-       follows="left|top"
-       height="20"
-       increment="0.5"
-       label="Low"
-       label_width="37"
-       layout="topleft"
-       left_pad="10"
-       max_val="500"
-       min_val="-500"
-       name="height_start_spin_3"
-       top_delta="0"
-       width="100" />
-<!--  northwest high-->
-     <spinner
-      follows="left|top"
-      height="20"
-      increment="0.5"
-      label="High"
-      label_width="37"
-      layout="topleft"
-      left="10"
-      max_val="500"
-      min_val="-500"
-      name="height_range_spin_1"
-      top_delta="20"
-      width="100" />
-<!--  northeast high-->
-    <spinner
-       follows="left|top"
-       height="20"
-       increment="0.5"
-       label="High"
-       label_width="37"
-       layout="topleft"
-       left_pad="10"
-       max_val="500"
-       min_val="-500"
-       name="height_range_spin_3"
-       top_delta="0"
-       width="100" />
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="51"
-     name="height_text_lbl8"
-     top_pad="10"
-     width="100">
-        Southwest
-    </text>
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl9"
-     top_delta="0"
-     width="100">
-        Southeast
-    </text>
-<!--  southwest low-->
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="Low"
-     label_width="37"
-     layout="topleft"
-     left="10"
-     max_val="500"
-     min_val="-500"
-     name="height_start_spin_0"
-     top_delta="15"
-     width="100" />
-<!--  southeast low-->
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="Low"
-     label_width="37"
-     layout="topleft"
-     left_pad="10"
-     max_val="500"
-     min_val="-500"
-     name="height_start_spin_2"
-     top_delta="0"
-     width="100" />
-<!--southwest high-->
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="High"
-     label_width="37"
-     layout="topleft"
-     left="10"
-     max_val="500"
-     min_val="-500"
-     name="height_range_spin_0"
-     top_delta="20"
-     width="100" />
-<!--  southeast high-->
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="High"
-     label_width="37"
-     layout="topleft"
-     left_pad="10"
-     max_val="500"
-     min_val="-500"
-     name="height_range_spin_2"
-     top_delta="0"
-     width="100" />
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="height_text_lbl10"
-     top_delta="30"
-     width="400"
-     word_wrap="true">
-      These values represent the blend range for the textures above.
-    </text>
-    <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left_delta="0"
-       name="height_text_lbl11"
-       top_delta="32"
-       width="400"
-       word_wrap="true">
-        Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
-      </text>
-    <button
-     enabled="false"
-     follows="left|bottom"
-     height="20"
-     label="Apply"
-     layout="topleft"
-     left="350"
-     name="apply_btn"
-     top="290"
-     width="100" />
-</panel>
-- 
cgit v1.2.3


From 95b8020d21b1ad60f82c767df7d7aac019ad8353 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 23 May 2011 16:11:50 -0700
Subject: adding marketplace inbox and outbox reviewed by Leslie

---
 indra/newview/skins/default/textures/textures.xml  |   2 +
 .../textures/widgets/MarketplaceBtn_Off.png        | Bin 0 -> 711 bytes
 .../textures/widgets/MarketplaceBtn_Selected.png   | Bin 0 -> 702 bytes
 .../skins/default/xui/en/sidepanel_inventory.xml   | 139 ++++++++++++---------
 4 files changed, 85 insertions(+), 56 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
 create mode 100644 indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1ca48b01a8..4f19dd9a6d 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -249,6 +249,8 @@ with the same filename but different name
 
   <texture name="Locked_Icon" file_name="icons/Locked_Icon.png" preload="false" />
 
+  <texture name="MarketplaceBtn_Off" file_name="widgets/MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
+  <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="22" scale.top="16" scale.right="26" scale.bottom="7" />
 
   <texture name="Microphone_On" file_name="icons/Microphone_On.png" preload="false" />
 
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
new file mode 100644
index 0000000000..e291a1c508
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
new file mode 100644
index 0000000000..33527f852b
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png differ
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 41b9283edc..a0caf80256 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -26,12 +26,12 @@
               top="0"
               orientation="vertical"
               name="inventory_layout_stack"
-              height="545"
+              height="540"
               width="330">
              <layout_panel
                  width="330"
                   follows="bottom|left|right"
-                 height="445">
+                 height="480">
                  <panel
                       class="panel_main_inventory"
                       filename="panel_main_inventory.xml"
@@ -41,92 +41,119 @@
                       name="panel_main_inventory"
                       top="0"
                       label=""
-                      height="445"
+                      height="480"
                       width="330" />
              </layout_panel>
              <layout_panel
                  width="330"
+                 auto_resize="true"
                   follows="bottom|left|right"
-                 height="100">
+                 min_dim="35"
+                 name="inbox_layout_panel"
+                 max_dim="125"
+                 height="35">
                  <panel
-                      class="panel_marketplace_inventory"
-                      follows="all"
+                      follows="top|left|right"
                       layout="topleft"
                       left="0"
-                      name="panel_marketplace"
+                      name="marketplace_inbox"
+                      class="panel_marketplace_inbox"
                       top="0"
                       label=""
-                      height="100"
+                      height="125"
                       width="330">
-                 <accordion
-                   follows="all"
-                   fit_parent="true"
-                   height="100"
-                   left="10"
-                   single_expansion="true"
-                   top="0"
-                   name="accordion"
-                   background_visible="true"
-                   bg_alpha_color="DkGray2"
-                   width="311">
-                     <accordion_tab
-                      name="tab_clothing"
-                      height="35" 
-                      min_height="150"
-                      fit_panel="false"
-                      title="MARKETPLACE INBOX">
+                     <button
+                         label="MARKETPLACE INBOX"
+                         name="inbox_btn"
+                         height="35"
+                         width="308"
+                         image_unselected="MarketplaceBtn_Off"
+                            image_selected="MarketplaceBtn_Selected"
+                         halign="left"
+                         follows="top|left|right"
+                         is_toggle="true"
+                         tab_stop="false"
+                         pad_left="35"
+                         top="0"
+                         left="10"
+                         ></button>
                          <panel
                              follows="all"
                              left="0"
-                             height="40"
+                             height="90"
                              width="250"
-                             top="0"
+                             top="30"
                            >
                              <text
                                  left ="40"
                                  top="15"
+                                 align="left"
                                  height="14"
                                  width="100"
                                  >Just a panel</text>    
                          </panel>
-                         <panel
-                     follows="all"
-                     left="0"
-                     height="40"
-                             visible="false"
-                     width="250"
-                     top="0"
+                     
+                 </panel>
+             </layout_panel>
+             <layout_panel
+  width="330"
+  auto_resize="true"
+   follows="bottom|left|right"
+  name="outbox_layout_panel"
+                 min_dim="35"
+                 max_dim="125"
+  height="35">
+                 <panel
+                      follows="top|left|right"
+                      layout="topleft"
+                      left="10"
+                      name="marketplace_outbox"
+                      class="panel_marketplace_outbox"
+                      top="0"
+                      label=""
+                      height="125"
+                      width="310">
+                     <button
+                         label="MARKETPLACE OUTBOX"
+                         is_toggle="true"
+                         name="outbox_btn"
+                      follows="top|left|right"
+                         image_unselected="MarketplaceBtn_Off"
+                            image_selected="MarketplaceBtn_Selected"
+                         height="35"
+                         tab_stop="false"
+                         width="308"
+                         halign="left"
+                         pad_left="35"
+                         top="0"
+                         left="0"
+                         ></button>
+                     <panel
+                         follows="all"
+                         left="0"
+                         height="90"
+                         width="250"
+                         top="30"
                            >
-                             <text
-                                 left ="40"
-                                 top="15"
-                                 height="14"
-                                 width="100"
-                                 >Just a panel 2</text>
-                         </panel>
-                     </accordion_tab>
-                     <accordion_tab
-                      name="tab_attachments"
-                      fit_panel="false"
-                      title="MARKETPLACE OUTBOX">
-                         <view
-                           follows="all"
-                           height="35"
-                           left="0"
-                           top="0"
-                           />
-                     </accordion_tab>
-                 </accordion>
+                         <text
+                             left ="40"
+                             top="15"
+                             align="left"
+                             height="14"
+                             width="100"
+                                 >Just a panel</text>
+                     </panel>
+
                  </panel>
              </layout_panel>
          </layout_stack>
 		<panel
 		     follows="bottom|left|right"
-			 height="25"
+			 height="30"
 			 layout="topleft"
 			 name="button_panel"
 			 left="9"
-			 top_pad="-2"
+			 top_pad="2"
 			 width="308">
 			<layout_stack
      	         follows="bottom|left|right"
-- 
cgit v1.2.3


From 406195e4f20e0bea341c8a7a979b56a8259b8536 Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Tue, 24 May 2011 09:38:49 -0700
Subject: Added badges version 0.1 to buttons.

Reviewed by Richard
---
 indra/newview/skins/default/colors.xml                 |   6 ++++++
 indra/newview/skins/default/textures/textures.xml      |   2 ++
 indra/newview/skins/default/textures/widgets/Badge.png | Bin 0 -> 1716 bytes
 indra/newview/skins/default/xui/en/widgets/badge.xml   |  14 ++++++++++++++
 4 files changed, 22 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/widgets/Badge.png
 create mode 100644 indra/newview/skins/default/xui/en/widgets/badge.xml

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index a19eccf748..0795e38366 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -132,6 +132,12 @@
     <color
      name="AvatarListItemIconVoiceLeftColor"
      reference="AvatarListItemIconOfflineColor" />
+    <color
+     name="BadgeImageColor"
+     value="0.25 0.85 0.25 1.0" />
+    <color
+     name="BadgeLabelColor"
+     reference="White" />
     <color
      name="ButtonBorderColor"
      reference="Unused?" />
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 4f19dd9a6d..2a78337f65 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -72,6 +72,8 @@ with the same filename but different name
   <texture name="BackButton_Over" file_name="icons/back_arrow_over.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
   <texture name="BackButton_Press" file_name="icons/back_arrow_press.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
 
+  <texture name="Badge" file_name="widgets/Badge.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+
   <texture name="Blank" file_name="Blank.png" preload="false" />
 
 
diff --git a/indra/newview/skins/default/textures/widgets/Badge.png b/indra/newview/skins/default/textures/widgets/Badge.png
new file mode 100644
index 0000000000..afda6b66b9
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Badge.png differ
diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml
new file mode 100644
index 0000000000..4eb633ac0c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/badge.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Additional attributes:
+   -->
+<badge font="SansSerifSmall"
+       image="Badge"
+       image_color="BadgeImageColor"
+       label_color="BadgeLabelColor"
+       location="top_left"
+       location_percent_hcenter="85"
+       location_percent_vcenter="85"
+       padding_horiz="7"
+       padding_vert="4"
+       >
+</badge>
-- 
cgit v1.2.3


From d755605f8dc5bba0abdb87f075db2b6a5ed4ecad Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 24 May 2011 20:21:23 +0300
Subject: STORM-1256 WIP Added perpetual indicator for progress of applying
 changes.

---
 indra/newview/skins/default/xui/en/panel_region_environment.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 907a707db8..956ba53a26 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -137,4 +137,11 @@
   left_pad="10"
   name="cancel_btn"
   width="100" /> 
+ <loading_indicator
+  height="23"
+  left="10"
+  name="progress_indicator"
+  top_delta="0"
+  visible="false"
+  width="23" />
 </panel>
-- 
cgit v1.2.3


From 5fc0cd9bf7d0c7f97bb63c5f887cce27e27a05f9 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 25 May 2011 08:55:03 -0400
Subject: storm-1156: remove "test day" controls and associated code

---
 .../default/xui/en/floater_day_cycle_options.xml   | 119 ---------------------
 1 file changed, 119 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
index b54dc87d24..59cdb295ef 100644
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
@@ -411,125 +411,6 @@
              left="12"
              top="101"
              width="240" />
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_pad="15"
-             name="DayCycleText2"
-             top_delta="71"
-             width="120">
-                Length of Cycle:
-            </text>
-            <spinner
-             control_name="WLLengthOfDayHour"
-             decimal_digits="0"
-             follows="left|top"
-             height="16"
-             increment="1"
-             initial_value="0"
-             label="Hour"
-             label_width="33"
-             layout="topleft"
-             left_delta="-3"
-             max_val="100"
-             name="WLLengthOfDayHour"
-             top_pad="4"
-             width="74" />
-            <spinner
-             control_name="WLLengthOfDayMin"
-             decimal_digits="0"
-             follows="left|top"
-             height="16"
-             increment="1"
-             initial_value="0"
-             label="Min"
-             label_width="25"
-             layout="topleft"
-             left_pad="2"
-             max_val="59"
-             name="WLLengthOfDayMin"
-             top_delta="0"
-             width="65" />
-            <spinner
-             control_name="WLLengthOfDaySec"
-             decimal_digits="0"
-             follows="left|top"
-             height="16"
-             increment="1"
-             initial_value="24"
-             label="Sec"
-             label_width="25"
-             layout="topleft"
-             left_pad="2"
-             max_val="59"
-             name="WLLengthOfDaySec"
-             top_delta="0"
-             width="65"/>
-            <text
-             type="string"
-             halign="right"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-23"
-             name="DayCycleText3"
-             top="114"
-             width="85">
-                Preview :
-            </text>
-            <button
-             height="20"
-             label="Play"
-             label_selected="Play"
-             layout="topleft"
-             left="480"
-             name="WLAnimSky"
-             top_pad="5"
-             width="83" />
-            <button
-             height="20"
-             label="Stop!"
-             label_selected="Stop"
-             layout="topleft"
-             left_pad="4"
-             name="WLStopAnimSky"
-             top_delta="0"
-             width="83" />
-            <button
-             height="20"
-             label="Use Estate Time"
-             label_selected="Go to Estate Time"
-             layout="topleft"
-             left="480"
-             name="WLUseLindenTime"
-             top_pad="9"
-             width="170" />
-            <button
-             height="20"
-             label="Save Test Day"
-             label_selected="Save Test Day"
-             layout="topleft"
-             left_delta="0"
-             name="WLSaveDayCycle"
-             top_pad="9"
-             width="170" />
-            <button
-             height="20"
-             label="Load Test Day"
-             label_selected="Load Test Day"
-             layout="topleft"
-             left_delta="0"
-             name="WLLoadDayCycle"
-             top_pad="3"
-             width="170" />
         </panel>
     </tab_container>
 </floater>
-- 
cgit v1.2.3


From 610b15aee47c5fae9df45b2d5ae515fd06b5a536 Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Wed, 25 May 2011 10:30:44 -0700
Subject: Updated badge to different art that is opaque

---
 indra/newview/skins/default/textures/widgets/Badge.png | Bin 1716 -> 958 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/widgets/Badge.png b/indra/newview/skins/default/textures/widgets/Badge.png
index afda6b66b9..862b13d219 100644
Binary files a/indra/newview/skins/default/textures/widgets/Badge.png and b/indra/newview/skins/default/textures/widgets/Badge.png differ
-- 
cgit v1.2.3


From 33e4a2c7b1ab3a06f1adb5edd9850523c897ea77 Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Wed, 25 May 2011 10:39:34 -0700
Subject: Updated Marketplace Inbox & Outbox panel to maintain size when one is
 expanded vs the other

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 403 +++++++++++----------
 1 file changed, 207 insertions(+), 196 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index a0caf80256..ce5cf4c622 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -9,170 +9,181 @@
 	  min_width="240"
 	  name="objects panel"
 	  width="333">
-	 <panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 name="sidepanel__inventory_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="true"
-		 width="330">
-         <layout_stack
-              follows="left|right|top|bottom"
-              layout="topleft"
-              left="0"
-              top="0"
-              orientation="vertical"
-              name="inventory_layout_stack"
-              height="540"
-              width="330">
-             <layout_panel
-                 width="330"
-                  follows="bottom|left|right"
-                 height="480">
-                 <panel
-                      class="panel_main_inventory"
-                      filename="panel_main_inventory.xml"
-                      follows="all"
-                      layout="topleft"
-                      left="0"
-                      name="panel_main_inventory"
-                      top="0"
-                      label=""
-                      height="480"
-                      width="330" />
-             </layout_panel>
-             <layout_panel
-                 width="330"
-                 auto_resize="true"
-                  follows="bottom|left|right"
-                 min_dim="35"
-                 name="inbox_layout_panel"
-                 max_dim="125"
-                 height="35">
-                 <panel
-                      follows="top|left|right"
-                      layout="topleft"
-                      left="0"
-                      name="marketplace_inbox"
-                      class="panel_marketplace_inbox"
-                      top="0"
-                      label=""
-                      height="125"
-                      width="330">
-                     <button
-                         label="MARKETPLACE INBOX"
-                         name="inbox_btn"
-                         height="35"
-                         width="308"
-                         image_unselected="MarketplaceBtn_Off"
-                            image_selected="MarketplaceBtn_Selected"
-                         halign="left"
-                         follows="top|left|right"
-                         is_toggle="true"
-                         tab_stop="false"
-                         pad_left="35"
-                         top="0"
-                         left="10"
-                         ></button>
-                         <panel
-                             follows="all"
-                             left="0"
-                             height="90"
-                             width="250"
-                             top="30"
-                           >
-                             <text
-                                 left ="40"
-                                 top="15"
-                                 align="left"
-                                 height="14"
-                                 width="100"
-                                 >Just a panel</text>    
-                         </panel>
-                     
-                 </panel>
-             </layout_panel>
-             <layout_panel
-  width="330"
-  auto_resize="true"
-   follows="bottom|left|right"
-  name="outbox_layout_panel"
-                 min_dim="35"
-                 max_dim="125"
-  height="35">
-                 <panel
-                      follows="top|left|right"
-                      layout="topleft"
-                      left="10"
-                      name="marketplace_outbox"
-                      class="panel_marketplace_outbox"
-                      top="0"
-                      label=""
-                      height="125"
-                      width="310">
-                     <button
-                         label="MARKETPLACE OUTBOX"
-                         is_toggle="true"
-                         name="outbox_btn"
-                      follows="top|left|right"
-                         image_unselected="MarketplaceBtn_Off"
-                            image_selected="MarketplaceBtn_Selected"
-                         height="35"
-                         tab_stop="false"
-                         width="308"
-                         halign="left"
-                         pad_left="35"
-                         top="0"
-                         left="0"
-                         ></button>
-                     <panel
-                         follows="all"
-                         left="0"
-                         height="90"
-                         width="250"
-                         top="30"
+    <panel
+        follows="all"
+        layout="topleft"
+        left="0"
+        name="sidepanel__inventory_panel"
+        top="0"
+        label=""
+        height="570"
+        visible="true"
+        width="330">
+        <layout_stack
+             follows="left|right|top|bottom"
+             layout="topleft"
+             left="0"
+             top="0"
+             orientation="vertical"
+             name="inventory_layout_stack"
+             height="535"
+             width="330">
+            <layout_panel
+                width="330"
+                follows="bottom|left|right"
+                height="480">
+                <panel
+                     class="panel_main_inventory"
+                     filename="panel_main_inventory.xml"
+                     follows="all"
+                     layout="topleft"
+                     left="0"
+                     name="panel_main_inventory"
+                     top="0"
+                     label=""
+                     height="480"
+                     width="330" />
+            </layout_panel>
+            <layout_panel
+                width="330"
+                auto_resize="true"
+                user_resize="false"
+                follows="bottom|left|right"
+                min_dim="35"
+                name="inbox_layout_panel"
+                max_dim="125"
+                height="35">
+                <panel
+                     follows="top|left|right"
+                     layout="topleft"
+                     left="0"
+                     name="marketplace_inbox"
+                     class="panel_marketplace_inbox"
+                     top="0"
+                     label=""
+                     height="125"
+                     width="330">
+                    <button
+                        label="MARKETPLACE INBOX"
+                        name="inbox_btn"
+                        height="35"
+                        width="308"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        halign="left"
+                        follows="top|left|right"
+                        is_toggle="true"
+                        tab_stop="false"
+                        pad_left="35"
+                        top="0"
+                        left="10" />
+                    <panel
+                        follows="all"
+                        left="0"
+                        height="90"
+                        width="250"
+                        top="30"
+                            >
+                        <text
+                            left ="40"
+                            top="15"
+                            align="left"
+                            height="14"
+                            width="100"
+                                 >Just a panel</text>
+                    </panel>
+                </panel>
+            </layout_panel>
+            <layout_panel
+                width="330"
+                auto_resize="true"
+                user_resize="false"
+                follows="bottom|left|right"
+                name="outbox_layout_panel"
+                min_dim="35"
+                max_dim="125"
+                height="35">
+                <panel
+                     follows="top|left|right"
+                     layout="topleft"
+                     left="10"
+                     name="marketplace_outbox"
+                     class="panel_marketplace_outbox"
+                     top="0"
+                     label=""
+                     height="125"
+                     width="310">
+                    <button
+                        label="MARKETPLACE OUTBOX"
+                        is_toggle="true"
+                        name="outbox_btn"
+                        follows="top|left|right"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        height="35"
+                        tab_stop="false"
+                        width="308"
+                        halign="left"
+                        pad_left="35"
+                        top="0"
+                        left="0" />
+                    <button
+                        label="SYNC"
+                        is_toggle="false"
+                        name="outbox_sync_btn"
+                        follows="top|right"
+                        height="25"
+                        tab_stop="false"
+                        width="45"
+                        halign="center"
+                        top="5"
+                        left="-50"
+                        enabled="false" />
+                    <panel
+                        follows="all"
+                        left="0"
+                        height="90"
+                        width="250"
+                        top="30"
                            >
-                         <text
-                             left ="40"
-                             top="15"
-                             align="left"
-                             height="14"
-                             width="100"
+                        <text
+                            left ="40"
+                            top="15"
+                            align="left"
+                            height="14"
+                            width="100"
                                  >Just a panel</text>
-                     </panel>
+                    </panel>
 
-                 </panel>
-             </layout_panel>
-         </layout_stack>
-		<panel
-		     follows="bottom|left|right"
-			 height="30"
-			 layout="topleft"
-			 name="button_panel"
-			 left="9"
-			 top_pad="2"
-			 width="308">
-			<layout_stack
-     	         follows="bottom|left|right"
-		         height="23"
-		         layout="topleft"
-		         mouse_opaque="false"
-		         name="button_panel_ls"
-		         left="0"
-		         orientation="horizontal"
-		         top="0"
-		         width="308">	
-			    <layout_panel
-			         follows="bottom|left|right"
-			         height="23"
+                </panel>
+            </layout_panel>
+        </layout_stack>
+        <panel
+             follows="bottom|left|right"
+             height="30"
+             layout="topleft"
+             name="button_panel"
+             left="9"
+             top_pad="7"
+             width="308">
+            <layout_stack
+                 follows="bottom|left|right"
+                 height="23"
+                 layout="topleft"
+                 mouse_opaque="false"
+                 name="button_panel_ls"
+                 left="0"
+                 orientation="horizontal"
+                 top="0"
+                 width="308">
+                <layout_panel
+                     follows="bottom|left|right"
+                     height="23"
                      layout="bottomleft"
-                     left="0"			
+                     left="0"
                      mouse_opaque="false"
                      name="info_btn_lp"
-                     user_resize="false" 
+                     user_resize="false"
                      auto_resize="true"
                      width="101">
                     <button
@@ -186,15 +197,15 @@
                          tool_tip="Show object profile"
                          top="0"
                          width="100" />
-			    </layout_panel>
-			    <layout_panel
+                </layout_panel>
+                <layout_panel
                      follows="bottom|left|right"
                      height="23"
                      layout="bottomleft"
-                     left_pad="1"			
+                     left_pad="1"
                      mouse_opaque="false"
                      name="share_btn_lp"
-                     user_resize="false" 
+                     user_resize="false"
                      auto_resize="true"
                      width="100">
                     <button
@@ -208,15 +219,15 @@
                          tool_tip="Share an inventory item"
                          top="0"
                          width="99" />
-			    </layout_panel>
-			    <layout_panel
+                </layout_panel>
+                <layout_panel
                      follows="bottom|left|right"
                      height="23"
                      layout="bottomleft"
-                     left_pad="1"			
+                     left_pad="1"
                      mouse_opaque="false"
                      name="shop_btn_lp"
-                     user_resize="false" 
+                     user_resize="false"
                      auto_resize="true"
                      width="100">
                     <button
@@ -262,36 +273,36 @@
                          tool_tip="Teleport to the selected area"
                          top="0"
                          width="99" />
-			    </layout_panel>
-			</layout_stack>
-		</panel>
-	</panel>
+                </layout_panel>
+            </layout_stack>
+        </panel>
+    </panel>
 
-<panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 class="sidepanel_item_info"
-		 filename="sidepanel_item_info.xml"
-		 name="sidepanel__item_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="false"
-		 width="330">
-	</panel>
+    <panel
+             follows="all"
+             layout="topleft"
+             left="0"
+             class="sidepanel_item_info"
+             filename="sidepanel_item_info.xml"
+             name="sidepanel__item_panel"
+             top="0"
+             label=""
+             height="570"
+             visible="false"
+             width="330">
+    </panel>
 
-<panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 class="sidepanel_task_info"
-		 filename="sidepanel_task_info.xml"
-		 name="sidepanel__task_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="false"
-		 width="330">
-	</panel>
+    <panel
+             follows="all"
+             layout="topleft"
+             left="0"
+             class="sidepanel_task_info"
+             filename="sidepanel_task_info.xml"
+             name="sidepanel__task_panel"
+             top="0"
+             label=""
+             height="570"
+             visible="false"
+             width="330">
+    </panel>
 </panel>
-- 
cgit v1.2.3


From 0f02f6784d0bc2a9cf72674da0b7bf2262ca8b58 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 25 May 2011 13:57:16 -0400
Subject: storm-1189: remove classic clouds

---
 indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml | 10 ----------
 .../newview/skins/default/xui/en/floater_windlight_options.xml | 10 ----------
 2 files changed, 20 deletions(-)

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

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
index 9d180a1f50..7ddb7ac1e1 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -987,16 +987,6 @@
              name="WLCloudScrollY"
              top_pad="6"
              width="200" />
-            <check_box
-             control_name="DrawClassicClouds"
-             follows="left|top"
-             height="16"
-             label="Draw Classic Clouds"
-             layout="topleft"
-             left_delta="-15"
-             name="DrawClassicClouds"
-             top_pad="20"
-             width="200" />
         </panel>
     </tab_container>
 <!--======== End of Controls panel ========-->
diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
index 249ad95c41..b121f3daa5 100644
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
@@ -1273,16 +1273,6 @@
              name="WLCloudScrollY"
              top="85"
              width="200" />
-            <check_box
-             control_name="DrawClassicClouds"
-             follows="left"
-             height="16"
-             label="Draw Classic Clouds"
-             layout="topleft"
-             left="480"
-             name="DrawClassicClouds"
-             top="104"
-             width="200" />
         </panel>
     </tab_container>
 </floater>
-- 
cgit v1.2.3


From f8907b327bb0009047b9cef54fde3d7dc6e8d6ca Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 25 May 2011 11:17:47 -0700
Subject: hooking up marketplace inbox to inventory

---
 indra/newview/skins/default/textures/textures.xml  |   2 +-
 .../textures/widgets/MarketplaceBtn_Off.png        | Bin 711 -> 1067 bytes
 .../textures/widgets/MarketplaceBtn_Selected.png   | Bin 702 -> 1086 bytes
 .../skins/default/xui/en/sidepanel_inventory.xml   |  32 ++++++++++++++-------
 4 files changed, 22 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 4f19dd9a6d..ec12d996bf 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -250,7 +250,7 @@ with the same filename but different name
   <texture name="Locked_Icon" file_name="icons/Locked_Icon.png" preload="false" />
 
   <texture name="MarketplaceBtn_Off" file_name="widgets/MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
-  <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="22" scale.top="16" scale.right="26" scale.bottom="7" />
+  <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
 
   <texture name="Microphone_On" file_name="icons/Microphone_On.png" preload="false" />
 
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
index e291a1c508..e603c44384 100644
Binary files a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
index 33527f852b..fbc164123f 100644
Binary files a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png differ
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index a0caf80256..7663db2756 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -53,7 +53,7 @@
                  max_dim="125"
                  height="35">
                  <panel
-                      follows="top|left|right"
+                      follows="all"
                       layout="topleft"
                       left="0"
                       name="marketplace_inbox"
@@ -79,18 +79,28 @@
                          ></button>
                          <panel
                              follows="all"
-                             left="0"
+                             left="10"
                              height="90"
-                             width="250"
-                             top="30"
+                             width="330"
+                             top="35"
                            >
-                             <text
-                                 left ="40"
-                                 top="15"
-                                 align="left"
-                                 height="14"
-                                 width="100"
-                                 >Just a panel</text>    
+                             <inventory_panel
+                                bg_opaque_color="DkGray2"
+                                bg_alpha_color="DkGray2"
+                                background_visible="true"
+                                background_opaque="true"
+                                border="false"
+                                bevel_style="none"
+                                follows="all"
+                                height="90"
+                                start_folder="Inbox"
+                                layout="topleft"
+                                left="0"
+                                name="All Items"
+                                sort_order_setting="InventorySortOrder"
+                                show_item_link_overlays="true"
+                                top="0"
+                                width="308" />   
                          </panel>
                      
                  </panel>
-- 
cgit v1.2.3


From fb9ef6233125d55d47104333d6b0062509850ff4 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 26 May 2011 06:31:11 -0400
Subject: storm-1189: remove classic clouds

---
 indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml | 10 ----------
 .../newview/skins/default/xui/en/floater_windlight_options.xml | 10 ----------
 2 files changed, 20 deletions(-)

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

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
index 9d180a1f50..7ddb7ac1e1 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -987,16 +987,6 @@
              name="WLCloudScrollY"
              top_pad="6"
              width="200" />
-            <check_box
-             control_name="DrawClassicClouds"
-             follows="left|top"
-             height="16"
-             label="Draw Classic Clouds"
-             layout="topleft"
-             left_delta="-15"
-             name="DrawClassicClouds"
-             top_pad="20"
-             width="200" />
         </panel>
     </tab_container>
 <!--======== End of Controls panel ========-->
diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
index 249ad95c41..b121f3daa5 100644
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
@@ -1273,16 +1273,6 @@
              name="WLCloudScrollY"
              top="85"
              width="200" />
-            <check_box
-             control_name="DrawClassicClouds"
-             follows="left"
-             height="16"
-             label="Draw Classic Clouds"
-             layout="topleft"
-             left="480"
-             name="DrawClassicClouds"
-             top="104"
-             width="200" />
         </panel>
     </tab_container>
 </floater>
-- 
cgit v1.2.3


From c0037909d576fc4922b92dfcc83d865d61ac43cb Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 26 May 2011 19:32:20 +0300
Subject: STORM-1284 FIXED Changes to region environment are now visible
 immediately.

Pressing "Apply" sends the settings update to server.
Pressing "Cancel" reverts to current region settings.
---
 indra/newview/skins/default/xui/en/panel_region_environment.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 956ba53a26..91d0bbe6bf 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -123,10 +123,10 @@
  <button
   follows="left|top"
   height="23"
-  label="Save"
+  label="Apply"
   layout="topleft"
   right="-160"
-  name="save_btn"
+  name="apply_btn"
   top_pad="150"
   width="100" />
  <button
-- 
cgit v1.2.3


From ebfbf2a561a98e5af4dde319edb49a663e27de26 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 26 May 2011 23:06:41 +0300
Subject: STORM-1285 WIP Connected "Delete Water / Sky / Day Cycle" floaters
 (not functional) to the main menu.

---
 .../default/xui/en/floater_delete_env_preset.xml   | 19 +++++++++---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 36 +++++++++++-----------
 2 files changed, 32 insertions(+), 23 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
index a7ab5abf38..1539c6448e 100644
--- a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
@@ -2,22 +2,31 @@
 <floater
  legacy_header_height="18"
  height="130"
- help_topic="environment_editor_floater"
+ help_topic=""
  layout="topleft"
- name="Environment Editor Floater"
+ name="Delete Env Preset"
  save_rect="true"
- title="DELETE PRESETS"
+ title="DELETE ENV PRESET"
  width="550">
+
+    <string name="title_water">Delete Water Preset</string>
+    <string name="title_sky">Delete Sky Preset</string>
+    <string name="title_day_cycle">Delete Day Cycle</string>
+
+    <string name="label_water">Preset:</string>
+    <string name="label_sky">Preset:</string>
+    <string name="label_day_cycle">Day cycle:</string>
+
     <text
      follows="top|left|right"
      font="SansSerif"
      height="10"
      layout="topleft"
      left="50"
-     name="delete_preset"
+     name="label"
      top="60"
      width="60">
-     Setting:
+     Preset:
     </text>
     <combo_box
      follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 38bffd04ed..d5d41b981f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -539,22 +539,22 @@
 	     	 	 label="New preset..."
 	     	 	 name="new_water_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="new_water"/>
 	     	 	</menu_item_call>
 	     	 	<menu_item_call
 	     	 	 label="Edit preset..."
 	     	 	 name="edit_water_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="edit_water"/>
 	     	 	</menu_item_call>
 	     	 	<menu_item_call
 	     	 	 label="Delete preset..."
 	     	 	 name="delete_water_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="delete_water"/>
 	     	 	</menu_item_call>
 	     	</menu>
 	     	
@@ -565,22 +565,22 @@
 	     	 	 label="New preset..."
 	     	 	 name="new_sky_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="new_sky"/>
 	     	 	</menu_item_call>
 	     	 	<menu_item_call
 	     	 	 label="Edit preset..."
 	     	 	 name="edit_sky_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="edit_sky"/>
 	     	 	</menu_item_call>
 	     	 	<menu_item_call
 	     	 	 label="Delete preset..."
 	     	 	 name="delete_sky_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="delete_sky"/>
 	     	 	</menu_item_call>
 	     	</menu>
 	     	
@@ -591,22 +591,22 @@
 	     	 	 label="New preset..."
 	     	 	 name="new_day_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="new_day_cycle"/>
 	     	 	</menu_item_call>
 	     	 	<menu_item_call
 	     	 	 label="Edit preset..."
 	     	 	 name="edit_day_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="edit_day_cycle"/>
 	     	 	</menu_item_call>
 	     	 	<menu_item_call
 	     	 	 label="Delete preset..."
 	     	 	 name="delete_day_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="delete_day_cycle"/>
 	     	 	</menu_item_call>
 	     	</menu>
 	    </menu>
-- 
cgit v1.2.3


From bbde07245bdcedd05bd37863d573c94c2af4c6f7 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 26 May 2011 23:09:30 +0300
Subject: STORM-1285 WIP Connected "Create/Edit Water / Sky / Day Cycle"
 floaters (not functional) to the main menu.

---
 .../skins/default/xui/en/floater_edit_day_cycle.xml  | 20 +++++++++++++-------
 .../skins/default/xui/en/floater_edit_sky_preset.xml | 18 ++++++++++++------
 .../default/xui/en/floater_edit_water_preset.xml     | 17 +++++++++++------
 3 files changed, 36 insertions(+), 19 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
index e76059751e..7572efea05 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
@@ -3,17 +3,23 @@
  legacy_header_height="18"
  height="450"
  layout="topleft"
- name="Environment Editor Floater"
- help_topic="environment_editor_floater"
+ name="Edit Day cycle"
+ help_topic=""
  save_rect="true"
  title="Edit Day Cycle"
  width="800">
+
+    <string name="title_new">Create a New Day Cycle</string>
+    <string name="title_edit">Edit Day Cycle</string>
+    <string name="hint_new">Name your day cycle, adjust the controls to create it, and click "Save".</string>
+    <string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string>
+
     <text
      follows="top|left|right"
      height="10"
      layout="topleft"
      left="30"
-     name="info_string"
+     name="hint"
      top="25"
      width="700">
      To edit your preset, adjust the controls then click "Save"
@@ -24,7 +30,7 @@
      height="10"
      layout="topleft"
      left="30"
-     name="info_string"
+     name="label"
      top_pad="25"
      width="120">
      Preset Name:
@@ -34,7 +40,7 @@
      follows="top|left"
      layout="topleft"
      left_pad="10"
-     name="water_preset_combo"
+     name="day_cycle_combo"
      top_delta="-5"
      width="200">
         <combo_box.item
@@ -47,7 +53,7 @@
      height="40"
      layout="topleft"
      left_pad="10"
-     name="info_string"
+     name="note"
      top_delta="0"
      width="405"
      wrap="true">
@@ -452,7 +458,7 @@
         <check_box
          follows="top|left"
          height="10"
-         label="Make this preset my new water setting"
+         label="Make this my new day cycle"
          layout="topleft"
          left="330"
          name="new_water_preset_chb"
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
index 9d180a1f50..924ffebedc 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -3,17 +3,23 @@
  legacy_header_height="18"
  height="375"
  layout="topleft"
- name="Environment Editor Floater"
- help_topic="environment_editor_floater"
+ name="Edit Sky Preset"
+ help_topic=""
  save_rect="true"
  title="Edit Sky Preset"
  width="900">
+
+    <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>
+
     <text
      follows="top|left|right"
      height="10"
      layout="topleft"
      left="30"
-     name="info_string"
+     name="hint"
      top="25"
      width="700">
      To edit your preset, adjust the controls then click "Save"
@@ -24,7 +30,7 @@
      height="10"
      layout="topleft"
      left="30"
-     name="info_string"
+     name="label"
      top_pad="25"
      width="120">
         Preset Name:
@@ -34,7 +40,7 @@
      follows="top|left"
      layout="topleft"
      left_pad="10"
-     name="water_preset_combo"
+     name="sky_preset_combo"
      top_delta="-5"
      width="200">
         <combo_box.item
@@ -47,7 +53,7 @@
      height="40"
      layout="topleft"
      left_pad="10"
-     name="info_string"
+     name="note"
      top_delta="0"
      width="405"
      wrap="true">
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
index a29c725ee9..cf4e224835 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
@@ -3,18 +3,23 @@
  legacy_header_height="18"
  height="450"
  layout="topleft"
- name="Environment Editor Floater"
- help_topic="environment_editor_floater"
+ name="Edit Water Preset"
+ help_topic=""
  save_rect="true"
  title="Edit Water Preset"
  width="900">
- 
+
+  <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>
+
   <text
    follows="top|left|right"
    height="10"
    layout="topleft"
    left="30"
-   name="info_string"
+   name="hint"
    top="25"
    width="700">
    	To edit your preset, adjust the controls then click "Save"
@@ -26,7 +31,7 @@
    height="10"
    layout="topleft"
    left="30"
-   name="info_string"
+   name="label"
    top_pad="25"
    width="120">
    	Preset Name:
@@ -51,7 +56,7 @@
    height="40"
    layout="topleft"
    left_pad="10"
-   name="info_string"
+   name="note"
    top_delta="0"
    width="405"
    wrap="true">
-- 
cgit v1.2.3


From c5bf566b2fae1688d9639b4e9e846d70a8c43e83 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 26 May 2011 16:55:59 -0400
Subject: storm-1281: remove estate time from region/estate floater,
 storm-1282: fix reordering of region/estate tabs

---
 .../skins/default/xui/en/panel_region_estate.xml   | 309 +++++++++------------
 1 file changed, 139 insertions(+), 170 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 1307d807e2..32714b68d6 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -20,7 +20,7 @@
      name="estate_help_text"
      top="14"
      word_wrap="true"
-     width="300">
+     >
         Changes to settings on this tab will affect all regions in the estate.
     </text>
     <text
@@ -30,9 +30,10 @@
      font="SansSerif"
      height="20"
      layout="topleft"
-     left_delta="0"
+     right="160"
      name="estate_text"
      top_pad="2"
+     halign="right"
      width="140">
         Estate:
     </text>
@@ -43,9 +44,9 @@
      font="SansSerif"
      height="20"
      layout="topleft"
-     left_delta="0"
+     top_delta="0"
      name="estate_name"
-     top_delta="16"
+     left_pad="6"
      width="150">
         (unknown)
     </text>
@@ -56,9 +57,10 @@
      font="SansSerif"
      height="20"
      layout="topleft"
-     left_delta="0"
+     right="160"
      name="owner_text"
-     top_pad="2"
+     top_pad="6"
+     halign="right"
      width="150">
         Estate owner:
     </text>
@@ -69,66 +71,40 @@
      font="SansSerif"
      height="20"
      layout="topleft"
-     left_delta="0"
+     top_delta="0"
      name="estate_owner"
-     top_delta="16"
+     left_pad="6"
      use_ellipses="true"
      width="290">
         (unknown)
     </text>
-    <view_border
-     bevel_style="in"
-     follows="top|left"
-     height="270"
-     layout="topleft"
-     left_delta="-4"
-     top_pad="5"
-     width="300" />
+
     <check_box
      height="20"
-     label="Use Global Time"
+     label="Allow Public Access"
      layout="topleft"
-     left="12"
-     name="use_global_time_check"
-     top="132"
+     left="10"
+     name="externally_visible_check"
+     top_pad="6"
      width="200" />
+
     <check_box
      height="20"
-     label="Fixed Sun"
-     layout="topleft"
-     left="12"
-     name="fixed_sun_check"
-     top="152"
-     width="100" />
-    <icon
-     height="20"
-     image_name="icon_day_cycle.tga"
+     label="Allow Voice Chat"
      layout="topleft"
-     left="47"
-     name="daycycle"
-     top="177"
-     width="165" />
-    <slider
-     follows="left|top"
-     height="20"
-     increment="0.001"
-     label="Phase"
-     layout="topleft"
-     left="12"
-     max_val="30"
-     min_val="6"
-     name="sun_hour_slider"
-     show_text="false"
-     top="202"
+     left="280"
+     name="voice_chat_check"
+     top_delta="0"
      width="200" />
     <check_box
      height="20"
-     label="Allow Public Access"
+     label="Allow Direct Teleport"
      layout="topleft"
      left_delta="0"
-     name="externally_visible_check"
-     top_pad="6"
-     width="200" />
+     name="allow_direct_teleport"
+     top_pad="4"
+     width="80" />
+
     <text
      type="string"
      length="1"
@@ -137,7 +113,7 @@
      layout="topleft"
      left="32"
      name="Only Allow"
-     top="250"
+     top_delta="0"
      width="278">
         Restrict Access to accounts verified by:
     </text>
@@ -161,50 +137,6 @@
      tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."
      top_pad="2"
      width="278" />
-    <check_box
-     height="20"
-     label="Allow Voice Chat"
-     layout="topleft"
-     left="12"
-     name="voice_chat_check"
-     top="304"
-     width="200" />
-    <check_box
-     height="20"
-     label="Allow Direct Teleport"
-     layout="topleft"
-     left="12"
-     name="allow_direct_teleport"
-     top_pad="4"
-     width="80" />
-    <button
-     enabled="false"
-     follows="left|top"
-     height="23"
-     label="Apply"
-     layout="topleft"
-     name="apply_btn"
-     top_pad="10"
-     left="110"
-     width="97" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Send Message To Estate..."
-     layout="topleft"
-     left="45"
-     name="message_estate_btn"
-     top_pad="20"
-     width="220" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Kick Resident from Estate..."
-     layout="topleft"
-     left="45"
-     name="kick_user_from_estate_btn"
-     top_pad="5"
-     width="220" />
 
     <text
      type="string"
@@ -214,16 +146,31 @@
      height="20"
      layout="topleft"
      name="estate_manager_label"
-     right="520"
+     top_pad="10"
+     left="10"
      width="200">
         Estate Managers:
     </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="280"
+     name="allow_resident_label"
+     top_delta="0"
+     width="200">
+        Allowed Residents:
+    </text>
+
+    <!-- Estate Managers box -->
     <view_border
      bevel_style="none"
      follows="top|left"
      height="71"
      layout="topleft"
-     right="520"
+     left="10"
      top_pad="-5"
      width="200" />
     <name_list
@@ -235,43 +182,15 @@
      name="estate_manager_name_list"
      top_delta="0"
      width="200" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Remove..."
-     layout="topleft"
-     name="remove_estate_manager_btn"
-     right="520"
-     top_pad="5"
-     width="97" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Add..."
-     layout="topleft"
-     left_delta="-103"
-     name="add_estate_manager_btn"
-     top_delta="0"
-     width="97" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="allow_resident_label"
-     top_pad="10"
-     width="200">
-        Allowed Residents:
-    </text>
+
+    <!-- Allowed Residents box -->
     <view_border
      bevel_style="none"
      follows="top|left"
      height="71"
      layout="topleft"
-     right="520"
-     top_pad="-5"
+     left="280"
+     top_delta="0"
      width="200" />
     <name_list
      follows="left|top"
@@ -282,42 +201,78 @@
      name="allowed_avatar_name_list"
      top_delta="0"
      width="200" />
+
+    <!-- Estate Managers buttons -->
+    <button
+     follows="left|top"
+     height="23"
+     label="Add..."
+     layout="topleft"
+     left="10"
+     name="add_estate_manager_btn"
+     top_pad="6"
+     width="97" />
     <button
      follows="left|top"
      height="23"
      label="Remove..."
      layout="topleft"
-     name="remove_allowed_avatar_btn"
-     right="520"
-     top_pad="5"
+     name="remove_estate_manager_btn"
+     left_pad="6"
      width="97" />
+
+    <!-- Allowed Residents buttons -->
     <button
      follows="left|top"
      height="23"
+     left="280"
      label="Add..."
      layout="topleft"
-     left_delta="-103"
      name="add_allowed_avatar_btn"
      top_delta="0"
      width="97" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Remove..."
+     layout="topleft"
+     name="remove_allowed_avatar_btn"
+     left_pad="6"
+     top_delta="0"
+     width="97" />
+
     <text
      type="string"
      length="1"
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="0"
+     left="10"
      name="allow_group_label"
      top_pad="10"
      width="200">
         Allowed Groups:
     </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="280"
+     name="ban_resident_label"
+     top_delta="0"
+     width="200">
+        Banned Residents:
+    </text>
+
+    <!-- Allowed Groups box -->
     <view_border
      bevel_style="none"
      follows="top|left"
      height="71"
      layout="topleft"
-     right="520"
+     left="10"
      top_pad="-5"
      width="200" />
     <name_list
@@ -329,43 +284,15 @@
      name="allowed_group_name_list"
      top_delta="0"
      width="200" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Remove..."
-     layout="topleft"
-     name="remove_allowed_group_btn"
-     right="520"
-     top_pad="5"
-     width="97" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Add..."
-     layout="topleft"
-     left_delta="-103"
-     name="add_allowed_group_btn"
-     top_delta="0"
-     width="97" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="ban_resident_label"
-     top_pad="10"
-     width="200">
-        Banned Residents:
-    </text>
+
+    <!-- Banned Residents box -->
     <view_border
      bevel_style="none"
      follows="top|left"
      height="71"
      layout="topleft"
-     right="520"
-     top_pad="-5"
+     left="280"
+     top_delta="0"
      width="200" />
     <name_list
      follows="left|top"
@@ -376,22 +303,64 @@
      name="banned_avatar_name_list"
      top_delta="0"
      width="200" />
+
+    <!-- Allowed Groups buttons -->
+    <button
+     follows="left|top"
+     height="23"
+     label="Add..."
+     layout="topleft"
+     left="10"
+     name="add_allowed_group_btn"
+     top_pad="6"
+     width="97" />
     <button
      follows="left|top"
      height="23"
      label="Remove..."
      layout="topleft"
-     name="remove_banned_avatar_btn"
-     right="520"
-     top_pad="5"
+     name="remove_allowed_group_btn"
+     left_pad="6"
+     top_delta="0"
      width="97" />
+
+    <!-- Banned Residents buttons -->
     <button
      follows="left|top"
      height="23"
      label="Add..."
      layout="topleft"
-     left_delta="-103"
+     left="280"
      name="add_banned_avatar_btn"
      top_delta="0"
      width="97" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Remove..."
+     layout="topleft"
+     name="remove_banned_avatar_btn"
+     top_delta="0"
+     left_pad="6"
+     width="97" />
+
+    <button
+     follows="left|top"
+     height="23"
+     label="Send Message To Estate..."
+     layout="topleft"
+     left="10"
+     name="message_estate_btn"
+     top_pad="20"
+     width="220" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Kick Resident from Estate..."
+     layout="topleft"
+     left="280"
+     name="kick_user_from_estate_btn"
+     top_delta="0"
+     width="220" />
+
 </panel>
-- 
cgit v1.2.3


From 6f1cdd4926444567d21b1d6e0735a445b981e56b Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 26 May 2011 22:04:11 -0400
Subject: remove old environment editor menu item

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 8 --------
 1 file changed, 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d8aec81eba..6b857cae17 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -522,14 +522,6 @@
                  parameter="editor"/>
 	     	</menu_item_call>
 	     	
-	        <menu_item_call
-	     	 label="Enviroment Settings (old)"
-	     	 name="Enviroment Settings (old)">
-	     	 	<menu_item_call.on_click
-	     	 	 function="World.EnvSettings"
-                 parameter="old_editor"/>
-	     	</menu_item_call>
-	     	
 	     	<menu_item_separator/>
 	     	
 	     	<menu
-- 
cgit v1.2.3


From 657e434fd59139436e8b97e5ecd01ca686e82269 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Mon, 30 May 2011 22:34:56 +0300
Subject: STORM-1253 WIP New day cycle editor.

Done:
* Creating new local day cycles.
* Editing existing local day cycles.
* Deleting day cycles.

To do:
* Editing region day cycle, dealing with skies in region scope.
* Handle teleport while editing a day cycle.
* Update UI when a day cycle or sky preset gets deleted.
* Make the time ctrl increase/decrease consistently.
---
 .../default/xui/en/floater_delete_env_preset.xml   |  2 ++
 .../default/xui/en/floater_edit_day_cycle.xml      | 30 ++++++++++++----------
 2 files changed, 18 insertions(+), 14 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
index 1539c6448e..82a541d40d 100644
--- a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
@@ -16,6 +16,8 @@
     <string name="label_water">Preset:</string>
     <string name="label_sky">Preset:</string>
     <string name="label_day_cycle">Day cycle:</string>
+   
+   <string name="msg_confirm_deletion">Are you sure you want to delete the selected preset?</string>
 
     <text
      follows="top|left|right"
diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
index 7572efea05..5b72d295e5 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
@@ -13,6 +13,7 @@
     <string name="title_edit">Edit Day Cycle</string>
     <string name="hint_new">Name your day cycle, adjust the controls to create it, and click "Save".</string>
     <string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string>
+    <string name="combo_label">-Select a preset-</string>
 
     <text
      follows="top|left|right"
@@ -42,12 +43,14 @@
      left_pad="10"
      name="day_cycle_combo"
      top_delta="-5"
-     width="200">
-        <combo_box.item
-         label="-Select a preset-"
-         name="item0"
-         value="any" />
-    </combo_box>
+     width="200" />
+    <line_editor
+     height="20"
+     left_delta="0"
+     name="day_cycle_name"
+     top_delta="0"
+     visible="true"
+     width="200" />
     <text
      follows="top|left|right"
      height="40"
@@ -110,7 +113,7 @@
     <panel
      follows="top|left"
      height="100"
-     name="day_cycle_slider"
+     name="day_cycle_slider_panel"
      layout="topleft"
      left_delta="25"
      top_pad="25"
@@ -428,7 +431,7 @@
      label="Preset"
      layout="topleft"
      left_pad="5"
-     name="WLKeyPresets"
+     name="WLSkyPresets"
      width="205" />
         <text
      type="string"
@@ -444,24 +447,23 @@
      width="35">
         Time:
     </text>
-    <text_editor
-     allow_scroll="false"
-     follows="left|top|right"
-     font="SansSerif"
+    <time
+     follows="left|top"
      height="16"
+     label_width="0"
      layout="topleft"
      left_pad="3"
      name="time"
      top_delta="-1"
      value="6:00 AM"
-     width="60"/> 
+     width="75"/> 
         <check_box
          follows="top|left"
          height="10"
          label="Make this my new day cycle"
          layout="topleft"
          left="330"
-         name="new_water_preset_chb"
+         name="make_default_cb"
          top="430"
          width="280"/>
         <button
-- 
cgit v1.2.3


From 03f1de97e697c55ed3b7e190f763162638f364f4 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Mon, 30 May 2011 22:39:13 +0300
Subject: STORM-1256 WIP Minor layout tweaks in the Environment tab of the
 Region/Estate floater.

---
 indra/newview/skins/default/xui/en/panel_region_environment.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 91d0bbe6bf..332167a423 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -47,7 +47,7 @@
   </radio_group>
  <panel
   follows="top|left"
-  height="170"
+  height="150"
   layout="topleft"
   left="50"
   name="user_environment_settings"
@@ -127,7 +127,7 @@
   layout="topleft"
   right="-160"
   name="apply_btn"
-  top_pad="150"
+  top_pad="10"
   width="100" />
  <button
   follows="left|top"
@@ -139,7 +139,7 @@
   width="100" /> 
  <loading_indicator
   height="23"
-  left="10"
+  left="50"
   name="progress_indicator"
   top_delta="0"
   visible="false"
-- 
cgit v1.2.3


From c213ab64c52ebb548c9561cfc56950ea3fd4ed6a Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Mon, 30 May 2011 22:48:41 +0300
Subject: STORM-1253 WIP Removed a duplicated translatable string from the Edit
 Day Cycle floater.

---
 indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
index 5b72d295e5..79dac60486 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
@@ -22,9 +22,7 @@
      left="30"
      name="hint"
      top="25"
-     width="700">
-     To edit your preset, adjust the controls then click "Save"
-    </text>
+     width="700" />
     <text
      follows="top|left|right"
      font="SansSerif"
-- 
cgit v1.2.3


From 19084baefd90a8dd298e123e28c22fa0f2e440e0 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Mon, 30 May 2011 22:51:35 +0300
Subject: STORM-1244 Minor visual changes in the Environment Settings floater.

* Changed title.
* Added hints at the top.
* Minor layout fixes.
---
 .../xui/en/floater_environment_settings.xml        | 36 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
index 48c8bc75d1..fc509b8c59 100644
--- a/indra/newview/skins/default/xui/en/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
@@ -6,9 +6,33 @@
  name="Environment Editor Floater"
  help_topic="environment_editor_floater"
  save_rect="true"
- title="ENVIRONMENT EDITOR"
+ title="ENVIRONMENT SETTINGS"
  width="540">
- 
+
+ <text
+  follows="top|left|right"
+  height="15"
+  layout="topleft"
+  left="20"
+  name="note"
+  top="25"
+  width="510"
+  wrap="true">
+  Use the options below to customize the environment settings for your viewer.
+ </text>
+ <text
+  follows="top|left|right"
+  font="SansSerifItalic"
+  height="15"
+  layout="topleft"
+  left_delta="0"
+  name="note"
+  top_pad="-"
+  width="510"
+  wrap="true">
+  Note: if you choose to use your own settings, they will not be visible to other users.
+ </text>
+
  <view_border
   bevel_style="none"  
   follows="top|left"
@@ -16,7 +40,7 @@
   layout="topleft"
   left="20"
   name="border"
-  top="38"
+  top_pad="8"
   width="500"/>  
  <radio_group
   follows="top|left"
@@ -43,7 +67,7 @@
   left="50"
   name="user_environment_settings"
   top_pad="0"
-  width="500">
+  width="470">
 
  <!-- Water Setting -->
  <text
@@ -122,9 +146,9 @@
    height="23"
    label="OK"
    layout="topleft"
-   right="-160"
+   right="-130"
    name="ok_btn"
-   top_pad="20"
+   top_pad="10"
    width="100" />
   <button
    follows="left|top"
-- 
cgit v1.2.3


From 4415c8505fd5c2bb0af6ec1324cee3d1ef6e8c78 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 30 May 2011 16:42:24 -0700
Subject: Adding the outbox

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 32 ++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index fa79975669..5f90a74e74 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -96,7 +96,7 @@
                                 start_folder="Inbox"
                                 layout="topleft"
                                 left="0"
-                                name="All Items"
+                                name="inventory_inbox"
                                 sort_order_setting="InventorySortOrder"
                                 show_item_link_overlays="true"
                                 top="0"
@@ -114,7 +114,7 @@
                  max_dim="125"
   height="35">
                  <panel
-                      follows="top|left|right"
+                      follows="all"
                       layout="topleft"
                       left="10"
                       name="marketplace_outbox"
@@ -153,16 +153,26 @@
                          follows="all"
                          left="0"
                          height="90"
-                         width="250"
-                         top="30"
+                         width="330"
+                         top="35"
                            >
-                         <text
-                             left ="40"
-                             top="15"
-                             align="left"
-                             height="14"
-                             width="100"
-                                 >Just a panel</text>
+                         <inventory_panel
+                              bg_opaque_color="DkGray2"
+                              bg_alpha_color="DkGray2"
+                              background_visible="true"
+                              background_opaque="true"
+                              border="false"
+                              bevel_style="none"
+                              follows="all"
+                              height="90"
+                              start_folder="Outbox"
+                              layout="topleft"
+                              left="0"
+                              name="inventory_outbox"
+                              sort_order_setting="InventorySortOrder"
+                              show_item_link_overlays="true"
+                              top="0"
+                              width="308" />
                      </panel>
 
                  </panel>
-- 
cgit v1.2.3


From 778088b74c19773646a50b5c0aa40015f2b242f3 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 31 May 2011 22:36:26 +0300
Subject: STORM-1253 WIP Implemented editing region day cycle.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
index 79dac60486..6cfa67f766 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
@@ -455,6 +455,14 @@
      top_delta="-1"
      value="6:00 AM"
      width="75"/> 
+        <loading_indicator
+         height="23"
+         layout="topleft"
+         left="25"
+         name="progress_indicator"
+         top="417"
+         visible="false"
+         width="23" />
         <check_box
          follows="top|left"
          height="10"
@@ -471,6 +479,7 @@
          layout="topleft"
          left_pad="0"
          name="save"
+         top="417"
          width="70"/>
         <button
          follows="bottom|right"
@@ -479,5 +488,6 @@
          layout="topleft"
          left_pad="15"
          name="cancel"
+         top_delta="0"
          width="70"/>
  </floater>
-- 
cgit v1.2.3


From ee1ba4d85c9e36e1563de5019c6ececa1f1c2d54 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 31 May 2011 15:11:55 -0700
Subject: adding inbox/outbox creation options

---
 .../newview/skins/default/xui/en/menu_inventory_add.xml  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 90e8db3709..30eff8e6a7 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -67,6 +67,22 @@
                  function="Inventory.DoCreate"
                  parameter="category" />
             </menu_item_call>
+    <menu_item_call
+                    label="Inbox"
+                   layout="topleft"
+                    name="Inbox">
+               <menu_item_call.on_click
+     function="Inventory.DoCreate"
+     parameter="inbox" />
+</menu_item_call>
+           <menu_item_call
+                 label="Outbox"
+                 layout="topleft"
+                 name="Outbox">
+             <menu_item_call.on_click
+     function="Inventory.DoCreate"
+     parameter="outbox" />
+</menu_item_call>
             <menu_item_call
              label="New Script"
              layout="topleft"
-- 
cgit v1.2.3


From cbf38d7c95e5968f47850d082eee223e1cef1aff Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Wed, 1 Jun 2011 12:28:49 -0700
Subject: EXP-841 FIX -- Create outbox sync button with basic enable/disable
 logic and animation

Functions are stubbed out.  Time delay happens through basic coroutine to allow animation viewing.

Reviewed by Leyla
---
 indra/newview/skins/default/colors.xml             |   5 +-
 .../skins/default/textures/icons/Inv_Gift.png      | Bin 0 -> 1335 bytes
 .../skins/default/textures/icons/Sync_Disabled.png | Bin 0 -> 1187 bytes
 .../skins/default/textures/icons/Sync_Enabled.png  | Bin 0 -> 1168 bytes
 .../default/textures/icons/Sync_Progress_1.png     | Bin 0 -> 1149 bytes
 .../default/textures/icons/Sync_Progress_2.png     | Bin 0 -> 1147 bytes
 .../default/textures/icons/Sync_Progress_3.png     | Bin 0 -> 1211 bytes
 .../default/textures/icons/Sync_Progress_4.png     | Bin 0 -> 1205 bytes
 .../default/textures/icons/Sync_Progress_5.png     | Bin 0 -> 1137 bytes
 .../default/textures/icons/Sync_Progress_6.png     | Bin 0 -> 1164 bytes
 indra/newview/skins/default/textures/textures.xml  |  15 ++++-
 .../skins/default/textures/widgets/Badge.png       | Bin 958 -> 0 bytes
 .../default/textures/widgets/Badge_Background.png  | Bin 0 -> 1352 bytes
 .../default/textures/widgets/Badge_Border.png      | Bin 0 -> 1565 bytes
 .../skins/default/xui/en/sidepanel_inventory.xml   |  69 ++++++++++++++-------
 .../newview/skins/default/xui/en/widgets/badge.xml |   2 +-
 16 files changed, 63 insertions(+), 28 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Inv_Gift.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Enabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Progress_1.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Progress_2.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Progress_3.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Progress_4.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Progress_5.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Progress_6.png
 delete mode 100644 indra/newview/skins/default/textures/widgets/Badge.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Badge_Background.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Badge_Border.png

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 0795e38366..a548849d60 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -134,7 +134,10 @@
      reference="AvatarListItemIconOfflineColor" />
     <color
      name="BadgeImageColor"
-     value="0.25 0.85 0.25 1.0" />
+     value="0.44 0.69 0.56 1.0" />
+    <color
+     name="BadgeImageBorderColor"
+     value="0.9 0.9 0.9 1.0" />
     <color
      name="BadgeLabelColor"
      reference="White" />
diff --git a/indra/newview/skins/default/textures/icons/Inv_Gift.png b/indra/newview/skins/default/textures/icons/Inv_Gift.png
new file mode 100644
index 0000000000..5afe85d72d
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_Gift.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Disabled.png b/indra/newview/skins/default/textures/icons/Sync_Disabled.png
new file mode 100644
index 0000000000..ca2e8def97
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Enabled.png b/indra/newview/skins/default/textures/icons/Sync_Enabled.png
new file mode 100644
index 0000000000..bc236c8b98
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Enabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_1.png b/indra/newview/skins/default/textures/icons/Sync_Progress_1.png
new file mode 100644
index 0000000000..624e556376
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Progress_1.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_2.png b/indra/newview/skins/default/textures/icons/Sync_Progress_2.png
new file mode 100644
index 0000000000..5769803b3f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Progress_2.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_3.png b/indra/newview/skins/default/textures/icons/Sync_Progress_3.png
new file mode 100644
index 0000000000..92d4bfb020
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Progress_3.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_4.png b/indra/newview/skins/default/textures/icons/Sync_Progress_4.png
new file mode 100644
index 0000000000..6d43eb3a9f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Progress_4.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_5.png b/indra/newview/skins/default/textures/icons/Sync_Progress_5.png
new file mode 100644
index 0000000000..766d063c99
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Progress_5.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_6.png b/indra/newview/skins/default/textures/icons/Sync_Progress_6.png
new file mode 100644
index 0000000000..dfe7f68b72
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Progress_6.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index f0a1893502..a6e71cc38e 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -72,11 +72,11 @@ with the same filename but different name
   <texture name="BackButton_Over" file_name="icons/back_arrow_over.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
   <texture name="BackButton_Press" file_name="icons/back_arrow_press.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
 
-  <texture name="Badge" file_name="widgets/Badge.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+  <texture name="Badge_Background" file_name="widgets/Badge_Background.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+  <texture name="Badge_Border" file_name="widgets/Badge_Border.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
 
   <texture name="Blank" file_name="Blank.png" preload="false" />
 
-
   <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="0" scale.top="1" scale.right="0" scale.bottom="0"  />
   <texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0"  />
 
@@ -479,7 +479,16 @@ with the same filename but different name
   <texture name="StopReload_Off" file_name="icons/StopReload_Off.png" preload="false" />
   <texture name="StopReload_Over" file_name="icons/StopReload_Over.png" preload="false" />
 
-  <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" />
+  <texture name="Sync_Disabled" file_name="icons/Sync_Disabled.png" preload="true" />
+  <texture name="Sync_Enabled" file_name="icons/Sync_Enabled.png" preload="true" />
+  <texture name="Sync_Progress_1" file_name="icons/Sync_Progress_1.png" preload="true" />
+  <texture name="Sync_Progress_2" file_name="icons/Sync_Progress_2.png" preload="true" />
+  <texture name="Sync_Progress_3" file_name="icons/Sync_Progress_3.png" preload="true" />
+  <texture name="Sync_Progress_4" file_name="icons/Sync_Progress_4.png" preload="true" />
+  <texture name="Sync_Progress_5" file_name="icons/Sync_Progress_5.png" preload="true" />
+  <texture name="Sync_Progress_6" file_name="icons/Sync_Progress_6.png" preload="true" />
+
+    <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" />
   <texture name="TabIcon_Appearance_Selected" file_name="taskpanel/TabIcon_Appearance_Selected.png" preload="false" />
   <texture name="TabIcon_Close_Off" file_name="taskpanel/TabIcon_Close_Off.png" preload="false" />
   <texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/textures/widgets/Badge.png b/indra/newview/skins/default/textures/widgets/Badge.png
deleted file mode 100644
index 862b13d219..0000000000
Binary files a/indra/newview/skins/default/textures/widgets/Badge.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/widgets/Badge_Background.png b/indra/newview/skins/default/textures/widgets/Badge_Background.png
new file mode 100644
index 0000000000..5089c30312
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Badge_Background.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Badge_Border.png b/indra/newview/skins/default/textures/widgets/Badge_Border.png
new file mode 100644
index 0000000000..4b086a63fb
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Badge_Border.png differ
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index fa79975669..ffc018b856 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -124,37 +124,60 @@
                       height="125"
                       width="310">
                      <button
-                         label="MARKETPLACE OUTBOX"
-                         is_toggle="true"
-                         name="outbox_btn"
-                      follows="top|left|right"
-                         image_unselected="MarketplaceBtn_Off"
-                            image_selected="MarketplaceBtn_Selected"
-                         height="35"
-                         tab_stop="false"
-                         width="308"
-                         halign="left"
-                         pad_left="35"
-                         top="0"
+                        label="MARKETPLACE OUTBOX"
+                        is_toggle="true"
+                        name="outbox_btn"
+                        follows="top|left|right"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        height="35"
+                        tab_stop="false"
+                        width="308"
+                        halign="left"
+                        pad_left="35"
+                        top="0"
                         left="0" />
-                    <button
-                        label="SYNC"
+                   <button
+                        image_disabled="Sync_Disabled"
+                        image_disabled_selected="Sync_Disabled"
+                        image_unselected="Sync_Enabled"
+                        image_selected="Sync_Enabled"
+                        label=""
                         is_toggle="false"
                         name="outbox_sync_btn"
                         follows="top|right"
-                        height="25"
+                        height="16"
                         tab_stop="false"
-                        width="45"
+                        width="16"
                         halign="center"
-                        top="5"
-                        left="-50"
+                        top="10"
+                        left="-40"
                         enabled="false" />
+                     <loading_indicator
+                        follows="top|right"
+                        name="outbox_sync_indicator"
+                        top="10"
+                        left="-40"
+                        height="16"
+                        width="16"
+                        images_per_sec="1.0"
+                        tab_stop="false"
+                        visible="false">
+                         <images>
+                             <image name="Sync_Progress_1"/>
+                             <image name="Sync_Progress_2"/>
+                             <image name="Sync_Progress_3"/>
+                             <image name="Sync_Progress_4"/>
+                             <image name="Sync_Progress_5"/>
+                             <image name="Sync_Progress_6"/>
+                         </images>
+                     </loading_indicator>
                      <panel
-                         follows="all"
-                         left="0"
-                         height="90"
-                         width="250"
-                         top="30"
+                        follows="all"
+                        left="0"
+                        height="90"
+                        width="250"
+                        top="30"
                            >
                          <text
                              left ="40"
diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml
index 4eb633ac0c..ceec09d1e4 100644
--- a/indra/newview/skins/default/xui/en/widgets/badge.xml
+++ b/indra/newview/skins/default/xui/en/widgets/badge.xml
@@ -2,7 +2,7 @@
 <!-- Additional attributes:
    -->
 <badge font="SansSerifSmall"
-       image="Badge"
+       image="Badge_Background"
        image_color="BadgeImageColor"
        label_color="BadgeLabelColor"
        location="top_left"
-- 
cgit v1.2.3


From 651a9587f82a143764856a4c2603d89c5d392cb6 Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Wed, 1 Jun 2011 13:50:14 -0700
Subject: EXP-862 FIX -- Disable marketplace inbox/outbox panel separator when
 inbox and outbox are collapsed

Marketplace panel is only resizable now when inbox or outbox is expanded.

Reviewed by Leyla
---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 41 ++++++++++++----------
 1 file changed, 22 insertions(+), 19 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index ffc018b856..484e90f083 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -26,11 +26,14 @@
               top="0"
               orientation="vertical"
               name="inventory_layout_stack"
-             height="535"
+              height="535"
               width="330">
              <layout_panel
+                 name="main_inventory_layout_panel"
+                 min_dim="150"
                  width="330"
-                  follows="bottom|left|right"
+                 follows="bottom|left|right"
+                 user_resize="false"
                  height="480">
                  <panel
                       class="panel_main_inventory"
@@ -45,14 +48,14 @@
                       width="330" />
              </layout_panel>
              <layout_panel
-                 width="330"
-                 auto_resize="true"
-                user_resize="false"
-                  follows="bottom|left|right"
-                 min_dim="35"
-                 name="inbox_layout_panel"
-                 max_dim="125"
-                 height="35">
+                    width="330"
+                    auto_resize="true"
+                    user_resize="false"
+                    follows="bottom|left|right"
+                    min_dim="35"
+                    name="inbox_layout_panel"
+                    max_dim="125"
+                    height="35">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -69,14 +72,14 @@
                          height="35"
                          width="308"
                          image_unselected="MarketplaceBtn_Off"
-                            image_selected="MarketplaceBtn_Selected"
+                         image_selected="MarketplaceBtn_Selected"
                          halign="left"
                          follows="top|left|right"
                          is_toggle="true"
                          tab_stop="false"
                          pad_left="35"
                          top="0"
-                        left="10" />
+                         left="10" />
                          <panel
                              follows="all"
                              left="10"
@@ -105,14 +108,14 @@
                  </panel>
              </layout_panel>
              <layout_panel
-  width="330"
-  auto_resize="true"
+                width="330"
+                auto_resize="true"
                 user_resize="false"
-   follows="bottom|left|right"
-  name="outbox_layout_panel"
-                 min_dim="35"
-                 max_dim="125"
-  height="35">
+                follows="bottom|left|right"
+                name="outbox_layout_panel"
+                min_dim="35"
+                max_dim="125"
+                height="35">
                  <panel
                       follows="top|left|right"
                       layout="topleft"
-- 
cgit v1.2.3


From 68088a27ba92d8a3ce84ee6e5691e9e2e08b7b32 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 1 Jun 2011 21:33:46 +0300
Subject: STORM-1305 WIP Minor UI changes.

---
 .../xui/en/floater_environment_settings.xml        | 35 +++++++++++-----------
 .../default/xui/en/panel_region_environment.xml    |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
index fc509b8c59..1b1cafaca6 100644
--- a/indra/newview/skins/default/xui/en/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="338"
+ height="328"
  layout="topleft"
  name="Environment Editor Floater"
  help_topic="environment_editor_floater"
@@ -20,18 +20,6 @@
   wrap="true">
   Use the options below to customize the environment settings for your viewer.
  </text>
- <text
-  follows="top|left|right"
-  font="SansSerifItalic"
-  height="15"
-  layout="topleft"
-  left_delta="0"
-  name="note"
-  top_pad="-"
-  width="510"
-  wrap="true">
-  Note: if you choose to use your own settings, they will not be visible to other users.
- </text>
 
  <view_border
   bevel_style="none"  
@@ -55,7 +43,7 @@
   	 layout="topleft"
   	 name="use_region_settings"/>
     <radio_item
-  	 label="Use my settings"
+  	 label="Customize my environment"
   	 layout="topleft"
   	 name="use_my_settings"
   	 top_pad="20"/>
@@ -69,6 +57,19 @@
   top_pad="0"
   width="470">
 
+ <text
+  follows="top|left|right"
+  font="SansSerifItalic"
+  height="15"
+  layout="topleft"
+  left_delta="0"
+  name="note"
+  top_pad="0"
+  width="470"
+  wrap="true">
+  Note: your custom settings will not be visible to other users.
+ </text>
+
  <!-- Water Setting -->
  <text
   name="water_settings_title"
@@ -76,7 +77,7 @@
   height="16"
   layout="topleft"
   left="50"
-  top_pad="30"
+  top="40"
   width="200">
   		Water Setting
   </text>
@@ -84,7 +85,7 @@
    follows="top|left"
    left_pad="2"
    name="water_settings_preset_combo"
-   top_delta="-7"
+   top_delta="-5"
    width="200">
       <combo_box.item
        label="-Select a preset-"
@@ -99,7 +100,7 @@
   height="16"
   layout="topleft"
   left="50"
-  top_pad="30"
+  top_pad="20"
   width="100">
   		Sky / Day Cycle
   </text>
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 332167a423..caa12010ca 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -40,7 +40,7 @@
    layout="topleft"
    name="use_sl_default_settings"/>
   <radio_item
-   label="Use my settings"
+   label="Use the following settings"
    layout="topleft"
    name="use_my_settings"
    top_pad="20"/>
-- 
cgit v1.2.3


From 17d862fdf2529a5b64a9a6909fe9eda22ab1057b Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 3 Jun 2011 18:28:51 +0300
Subject: STORM-1253 WIP Fixed track colors in the day cycle editor.

- Selected key now visually differs from others.
- Disabled triangle becomes more transparent.
---
 indra/newview/skins/default/colors.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 973df6998a..b0628dfe67 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -500,22 +500,22 @@
 	  reference="DkGray2" />
     <color
      name="MultiSliderDisabledThumbColor"
-     reference="Unused?" />
+     reference="Black" />
     <color
      name="MultiSliderThumbCenterColor"
-     reference="Unused?" />
+     reference="White" />
     <color
      name="MultiSliderThumbCenterSelectedColor"
-     reference="Unused?" />
+     reference="Green" />
     <color
      name="MultiSliderThumbOutlineColor"
      reference="Unused?" />
     <color
      name="MultiSliderTrackColor"
-     reference="Unused?" />
+     reference="LtGray" />
     <color
      name="MultiSliderTriangleColor"
-     reference="Unused?" />
+     reference="Yellow" />
   <!--
     <color
       name="NameTagBackground"
-- 
cgit v1.2.3


From 88407a0f0c19f1ee36c176f2fdc2117646d65b80 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 6 Jun 2011 15:52:16 -0400
Subject: STORM-1308: add help buttons and IDs to environment floaters

---
 indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml    | 2 +-
 indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml   | 8 ++++----
 indra/newview/skins/default/xui/en/floater_edit_water_preset.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_region_environment.xml  | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
index 6cfa67f766..b93406053c 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
@@ -4,7 +4,7 @@
  height="450"
  layout="topleft"
  name="Edit Day cycle"
- help_topic=""
+ help_topic="day_presets"
  save_rect="true"
  title="Edit Day Cycle"
  width="800">
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
index ae7e83ee56..6ffb3480ad 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -4,7 +4,7 @@
  height="375"
  layout="topleft"
  name="Edit Sky Preset"
- help_topic=""
+ help_topic="sky_preset"
  save_rect="true"
  title="Edit Sky Preset"
  width="900">
@@ -98,7 +98,7 @@
      layout="topleft"
      left="1"
      mouse_opaque="false"
-     help_topic="windlight_atmosphere_tab"
+     help_topic="sky_preset_atmosphere"
      name="Atmosphere"
      top="60"
      width="698">
@@ -379,7 +379,7 @@
          label="LIGHTING"
          layout="topleft"
          left_delta="0"
-         help_topic="windlight_lighting_tab"
+         help_topic="sky_preset_lighting"
          name="Lighting"
          top_delta="4"
          width="698">
@@ -685,7 +685,7 @@
          layout="topleft"
          left_delta="0"
          mouse_opaque="false"
-         help_topic="windlight_clouds_tab"
+         help_topic="sky_preset_clouds"
          name="Clouds"
          top_delta="4"
          width="698">
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
index cf4e224835..f107e67f74 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
@@ -4,7 +4,7 @@
  height="450"
  layout="topleft"
  name="Edit Water Preset"
- help_topic=""
+ help_topic="water_preset"
  save_rect="true"
  title="Edit Water Preset"
  width="900">
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index caa12010ca..5bcc19356d 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -5,6 +5,7 @@
  height="300"
  label="Environment"
  layout="topleft"
+ help_topic="panel_region_environment_tab"
  name="panel_env_info"
  width="530"> 
  <text
-- 
cgit v1.2.3


From 4e05ea6ebda88f3e2af4b585f629b11f3729096e Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 7 Jun 2011 00:17:21 +0300
Subject: STORM-1255 WIP Implemented creating, editing and removing local sky
 presets.

---
 .../skins/default/xui/en/floater_edit_sky_preset.xml    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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

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
index 6ffb3480ad..fa51059d44 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -13,6 +13,7 @@
     <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"
@@ -42,12 +43,13 @@
      left_pad="10"
      name="sky_preset_combo"
      top_delta="-5"
-     width="200">
-        <combo_box.item
-         label="-Select a preset-"
-         name="item0"
-         value="any" />
-        </combo_box>
+     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"
@@ -61,7 +63,6 @@
     </text>
  <!--======== Controls panel ========-->
     <view_border
-     border="true"
      bevel_style="none"
      follows="top|left"
      height="225"
@@ -1003,7 +1004,7 @@
      label="Make this preset my new sky setting"
      layout="topleft"
      left="430"
-     name="new_water_preset_chb"
+     name="make_default_cb"
      top_pad="30"
      width="280"/>
     <button
-- 
cgit v1.2.3


From 0c0f7558782edccda375609777967184b8440441 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 6 Jun 2011 16:30:22 -0700
Subject: fixing drag and drop for inbox, adding inbox text and cleaning up
 context menus

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 25 ++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 49c45233d8..91de3047e6 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -9,7 +9,7 @@
 	  min_width="240"
 	  name="objects panel"
 	  width="333">
-	 <panel
+    <panel
 		 follows="all"
 		 layout="topleft"
 		 left="0"
@@ -66,6 +66,8 @@
                       label=""
                       height="125"
                       width="330">
+                     <string name="InboxLabelWithArg">MARKETPLACE INBOX ([NUM])</string>
+                     <string name="InboxLabelNoArg">MARKETPLACE INBOX</string>
                      <button
                          label="MARKETPLACE INBOX"
                          name="inbox_btn"
@@ -84,9 +86,24 @@
                              follows="all"
                              left="10"
                              height="90"
-                             width="330"
+                             width="308"
                              top="35"
+                             bg_opaque_color="InventoryBackgroundColor"
+  background_visible="true"
+  background_opaque="true"
                            >
+                             <text
+                                 type="string"
+		length="1"
+		follows="top|left|right"
+		font="SansSerifSmall"
+                                 use_ellipses="true"
+                                 name="move_items_text"
+                               top="10"
+                               left="4"
+                               height="20"
+                               width="304"
+                               >Move items to your inventory to manage and use them.</text>
                              <inventory_panel
                                 bg_opaque_color="DkGray2"
                                 bg_alpha_color="DkGray2"
@@ -95,14 +112,14 @@
                                 border="false"
                                 bevel_style="none"
                                 follows="all"
-                                height="90"
+                                height="70"
                                 start_folder="Inbox"
                                 layout="topleft"
                                 left="0"
                                 name="inventory_inbox"
                                 sort_order_setting="InventorySortOrder"
                                 show_item_link_overlays="true"
-                                top="0"
+                                top_pad="0"
                                 width="308" />   
                          </panel>
                  </panel>
-- 
cgit v1.2.3


From 98bcd9e2efe4cc0dc5e51da09c6f18424b9d9144 Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Mon, 6 Jun 2011 17:00:59 -0700
Subject: EXP-859 FIX -- Save setting for last time inbox expanded EXP-841
 PROGRESS -- Create outbox sync button with basic enable/disable logic and
 animation EXP-866 PROGRESS -- Create inbox observer to dynamically update
 inbox item count and badge value EXP-872 PROGRESS -- Hide inbox and outbox
 unless applicable

Inbox expansion time is now saved as setting variable "LastInventoryInboxExpand".

New outbox sync button art.

Observers for items and categories are now implemented in the LLSidepanelInventory but the exact
method of use is still to be determined.

Functions are in place to show and hide the inbox and outbox panels but the logic around the
decision is TBD.

The resize bar for the inbox/outbox is now disabled when both inbox and outbox are collapsed.

Reviewed by Leyla.
---
 .../default/textures/icons/OutboxPush_Disabled.png | Bin 0 -> 1848 bytes
 .../default/textures/icons/OutboxPush_Off.png      | Bin 0 -> 1835 bytes
 .../skins/default/textures/icons/OutboxPush_On.png | Bin 0 -> 1851 bytes
 .../default/textures/icons/OutboxPush_On_Over.png  | Bin 0 -> 1863 bytes
 .../textures/icons/OutboxPush_On_Selected.png      | Bin 0 -> 1912 bytes
 .../default/textures/icons/OutboxPush_Over.png     | Bin 0 -> 1826 bytes
 .../default/textures/icons/OutboxPush_Press.png    | Bin 0 -> 1891 bytes
 .../textures/icons/OutboxPush_Progress_1.png       | Bin 0 -> 1848 bytes
 .../textures/icons/OutboxPush_Progress_2.png       | Bin 0 -> 1807 bytes
 .../textures/icons/OutboxPush_Progress_3.png       | Bin 0 -> 1819 bytes
 .../textures/icons/OutboxPush_Progress_4.png       | Bin 0 -> 1894 bytes
 .../textures/icons/OutboxPush_Progress_5.png       | Bin 0 -> 1921 bytes
 .../textures/icons/OutboxPush_Progress_6.png       | Bin 0 -> 1853 bytes
 .../default/textures/icons/OutboxPush_Selected.png | Bin 0 -> 1894 bytes
 .../icons/OutboxPush_Selected_Disabled.png         | Bin 0 -> 1840 bytes
 .../textures/icons/OutboxPush_Selected_Over.png    | Bin 0 -> 1870 bytes
 .../textures/icons/OutboxPush_Selected_Press.png   | Bin 0 -> 1912 bytes
 indra/newview/skins/default/textures/textures.xml  |  19 +++-
 .../skins/default/xui/en/sidepanel_inventory.xml   | 117 +++++++++++----------
 19 files changed, 79 insertions(+), 57 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_On.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Over.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Press.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Selected.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png

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

diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png
new file mode 100644
index 0000000000..be58114aa1
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Off.png b/indra/newview/skins/default/textures/icons/OutboxPush_Off.png
new file mode 100644
index 0000000000..e6b9480ab1
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On.png b/indra/newview/skins/default/textures/icons/OutboxPush_On.png
new file mode 100644
index 0000000000..ffda2e92d4
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_On.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png
new file mode 100644
index 0000000000..6b5911014f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png b/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png
new file mode 100644
index 0000000000..0e60b417b0
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Over.png
new file mode 100644
index 0000000000..9c26b92e73
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Over.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Press.png
new file mode 100644
index 0000000000..3b5d462975
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Press.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png
new file mode 100644
index 0000000000..f85be047b0
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png
new file mode 100644
index 0000000000..cd4e482216
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png
new file mode 100644
index 0000000000..d212a871ce
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png
new file mode 100644
index 0000000000..e5b6023e36
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png
new file mode 100644
index 0000000000..e1911a092f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png
new file mode 100644
index 0000000000..9e59f7843a
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png
new file mode 100644
index 0000000000..51e8bff646
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png
new file mode 100644
index 0000000000..300e2e69e1
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png
new file mode 100644
index 0000000000..32fb236381
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png
new file mode 100644
index 0000000000..827f343b1e
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index a6e71cc38e..7888674b04 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -332,6 +332,23 @@ with the same filename but different name
   <texture name="OptionsMenu_Off" file_name="icons/OptionsMenu_Off.png" preload="false" />
   <texture name="OptionsMenu_Press" file_name="icons/OptionsMenu_Press.png" preload="false" />
 
+  <texture name="OutboxPush_Disabled" file_name="icons/OutboxPush_Disabled.png" preload="true" />
+  <texture name="OutboxPush_Off" file_name="icons/OutboxPush_Off.png" preload="true" />
+  <texture name="OutboxPush_On" file_name="icons/OutboxPush_On.png" preload="true" />
+  <texture name="OutboxPush_On_Over" file_name="icons/OutboxPush_On_Over.png" preload="true" />
+  <texture name="OutboxPush_Over" file_name="icons/OutboxPush_Over.png" preload="true" />
+  <texture name="OutboxPush_Press" file_name="icons/OutboxPush_Press.png" preload="true" />
+  <texture name="OutboxPush_Progress_1" file_name="icons/OutboxPush_Progress_1.png" preload="true" />
+  <texture name="OutboxPush_Progress_2" file_name="icons/OutboxPush_Progress_2.png" preload="true" />
+  <texture name="OutboxPush_Progress_3" file_name="icons/OutboxPush_Progress_3.png" preload="true" />
+  <texture name="OutboxPush_Progress_4" file_name="icons/OutboxPush_Progress_4.png" preload="true" />
+  <texture name="OutboxPush_Progress_5" file_name="icons/OutboxPush_Progress_5.png" preload="true" />
+  <texture name="OutboxPush_Progress_6" file_name="icons/OutboxPush_Progress_6.png" preload="true" />
+  <texture name="OutboxPush_Selected" file_name="icons/OutboxPush_Selected.png" preload="true" />
+  <texture name="OutboxPush_Selected_Disabled" file_name="icons/OutboxPush_Selected_Disabled.png" preload="true" />
+  <texture name="OutboxPush_Selected_Over" file_name="icons/OutboxPush_Selected_Over.png" preload="true" />
+  <texture name="OutboxPush_Selected_Press" file_name="icons/OutboxPush_Selected_Press.png" preload="true" />
+
   <texture name="PanOrbit_Off" file_name="bottomtray/PanOrbit_Off.png" preload="false" />
 
   <texture name="Parcel_Exp_Color" file_name="icons/Parcel_Exp_Color.png" preload="false" />
@@ -488,7 +505,7 @@ with the same filename but different name
   <texture name="Sync_Progress_5" file_name="icons/Sync_Progress_5.png" preload="true" />
   <texture name="Sync_Progress_6" file_name="icons/Sync_Progress_6.png" preload="true" />
 
-    <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" />
+  <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" />
   <texture name="TabIcon_Appearance_Selected" file_name="taskpanel/TabIcon_Appearance_Selected.png" preload="false" />
   <texture name="TabIcon_Close_Off" file_name="taskpanel/TabIcon_Close_Off.png" preload="false" />
   <texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 91de3047e6..c945f27ac6 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -89,21 +89,21 @@
                              width="308"
                              top="35"
                              bg_opaque_color="InventoryBackgroundColor"
-  background_visible="true"
-  background_opaque="true"
+                             background_visible="true"
+                             background_opaque="true"
                            >
                              <text
                                  type="string"
-		length="1"
-		follows="top|left|right"
-		font="SansSerifSmall"
+                                 length="1"
+                                 follows="top|left|right"
+                                 font="SansSerifSmall"
                                  use_ellipses="true"
                                  name="move_items_text"
-                               top="10"
-                               left="4"
-                               height="20"
-                               width="304"
-                               >Move items to your inventory to manage and use them.</text>
+                                 top="10"
+                                 left="4"
+                                 height="20"
+                                 width="304"
+                                 >Move items to your inventory to manage and use them.</text>
                              <inventory_panel
                                 bg_opaque_color="DkGray2"
                                 bg_alpha_color="DkGray2"
@@ -125,14 +125,14 @@
                  </panel>
              </layout_panel>
              <layout_panel
-  width="330"
-  auto_resize="true"
+                width="330"
+                auto_resize="true"
                 user_resize="false"
-   follows="bottom|left|right"
-  name="outbox_layout_panel"
-                 min_dim="35"
-                 max_dim="125"
-  height="35">
+                follows="bottom|left|right"
+                name="outbox_layout_panel"
+                min_dim="35"
+                max_dim="125"
+                height="35">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -144,52 +144,57 @@
                       height="125"
                       width="310">
                      <button
-                         label="MARKETPLACE OUTBOX"
-                         is_toggle="true"
-                         name="outbox_btn"
-                      follows="top|left|right"
-                         image_unselected="MarketplaceBtn_Off"
-                            image_selected="MarketplaceBtn_Selected"
-                         height="35"
-                         tab_stop="false"
-                         width="308"
-                         halign="left"
-                         pad_left="35"
-                         top="0"
-                        left="0" />
-                    <button
-                        image_disabled="Sync_Disabled"
-                        image_disabled_selected="Sync_Disabled"
-                        image_unselected="Sync_Enabled"
-                        image_selected="Sync_Enabled"
-                        label=""
-                        is_toggle="false"
-                        name="outbox_sync_btn"
-                        follows="top|right"
-                        height="16"
+                        label="MARKETPLACE OUTBOX"
+                        is_toggle="true"
+                        name="outbox_btn"
+                        follows="top|left|right"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        height="35"
                         tab_stop="false"
-                        width="16"
-                        halign="center"
-                        top="10"
-                        left="-40"
-                        enabled="false" />
+                        width="308"
+                        halign="left"
+                        pad_left="35"
+                        top="0"
+                        left="0" />
+                     <button
+                         image_unselected="OutboxPush_Off"
+                         image_selected="OutboxPush_Selected"
+                         image_hover_selected="OutboxPush_Selected_Over"
+                         image_hover_unselected="OutboxPush_Over"
+                         image_disabled_selected="OutboxPush_Selected_Disabled"
+                         image_disabled="OutboxPush_Disabled"
+                         image_pressed="OutboxPush_Press"
+                         image_pressed_selected="OutboxPush_Selected_Press"
+                         label=""
+                         tool_tip="Push to my Marketplace Storefront"
+                         is_toggle="false"
+                         name="outbox_sync_btn"
+                         follows="top|right"
+                         tab_stop="false"
+                         halign="center"
+                         top="6"
+                         left="-50"
+                         height="23"
+                         width="32"
+                         enabled="false" />
                      <loading_indicator
                         follows="top|right"
                         name="outbox_sync_indicator"
-                        top="10"
-                        left="-40"
-                        height="16"
-                        width="16"
-                        images_per_sec="1.0"
+                        top="6"
+                        left="-50"
+                        height="23"
+                        width="32"
+                        images_per_sec="1.15"
                         tab_stop="false"
                         visible="false">
                          <images>
-                             <image name="Sync_Progress_1"/>
-                             <image name="Sync_Progress_2"/>
-                             <image name="Sync_Progress_3"/>
-                             <image name="Sync_Progress_4"/>
-                             <image name="Sync_Progress_5"/>
-                             <image name="Sync_Progress_6"/>
+                             <image name="OutboxPush_Progress_1"/>
+                             <image name="OutboxPush_Progress_2"/>
+                             <image name="OutboxPush_Progress_3"/>
+                             <image name="OutboxPush_Progress_4"/>
+                             <image name="OutboxPush_Progress_5"/>
+                             <image name="OutboxPush_Progress_6"/>
                          </images>
                      </loading_indicator>
                      <panel
-- 
cgit v1.2.3


From cf31723a1a258e0452dd26d9f5eb5fcdac290e05 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 6 Jun 2011 17:12:17 -0700
Subject: EXP-844	INITIAL CHECKIN - FUNCTION DISABLED - As a first time
 user I would like to see a video after I log in that highlights the best
 features of Second Life

---
 indra/newview/skins/default/xui/en/panel_progress.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 2868d91cc7..4535c56339 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -132,4 +132,12 @@
      name="cancel_btn"
      top="700"
      width="90" />
+  <web_browser
+   follows="all"
+   layout="topleft"
+   left="0"
+   name="login_media_panel"
+   width="1024"
+   height="768"
+   top="0"/>
 </panel>
-- 
cgit v1.2.3


From 7151a4e6b02f02155387fc595034a42aebd7ec9c Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 7 Jun 2011 17:41:26 +0300
Subject: STORM-1255 WIP Consistency pass on sky presets removal.

* Update all related floaters when a sky preset gets removed.
* Don't allow removing skies referenced by (local) day cycles.
* Other minor fixes.
---
 .../skins/default/xui/en/floater_delete_env_preset.xml       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
index 82a541d40d..b5de4166f6 100644
--- a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
@@ -17,7 +17,10 @@
     <string name="label_sky">Preset:</string>
     <string name="label_day_cycle">Day cycle:</string>
    
-   <string name="msg_confirm_deletion">Are you sure you want to delete the selected preset?</string>
+    <string name="msg_confirm_deletion">Are you sure you want to delete the selected preset?</string>
+    <string name="msg_sky_is_referenced">Cannot remove a preset that is referenced by some day cycle(s).</string>
+
+    <string name="combo_label">-Select a preset-</string>
 
     <text
      follows="top|left|right"
@@ -36,12 +39,7 @@
      left_pad="10"
      name="preset_combo"
      top_delta="-5"
-     width="200">
-        <combo_box.item
-         label="-Select a preset-"
-         name="item0"
-         value="any" />
-    </combo_box>
+     width="200"/>
     <button
      follows="bottom|right"
      height="23"
-- 
cgit v1.2.3


From 8d2985fb5ddba40a5d6db72a4a8afdd3af4af062 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 7 Jun 2011 18:31:02 +0300
Subject: STORM-1255 WIP Fixed sky/day/water preset name being limited to 20
 chars.

---
 indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml    | 1 +
 indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml   | 1 +
 indra/newview/skins/default/xui/en/floater_edit_water_preset.xml | 1 +
 3 files changed, 3 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
index b93406053c..2c78d51c9f 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
@@ -39,6 +39,7 @@
      follows="top|left"
      layout="topleft"
      left_pad="10"
+     max_chars="100"
      name="day_cycle_combo"
      top_delta="-5"
      width="200" />
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
index fa51059d44..64fbaf6b99 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -41,6 +41,7 @@
      follows="top|left"
      layout="topleft"
      left_pad="10"
+     max_chars="100"
      name="sky_preset_combo"
      top_delta="-5"
      width="200"/>
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
index f107e67f74..77484bcfea 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
@@ -42,6 +42,7 @@
    	follows="top|left"
    	layout="topleft"
    	left_pad="10"
+   	max_chars="100"
    	name="water_preset_combo"
    	top_delta="-5"
    	width="200">
-- 
cgit v1.2.3


From 1aed9849285b574346087eb5ac7e0c8038fa21fe Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Tue, 7 Jun 2011 13:57:19 -0700
Subject: EXP-865 PROGRESS -- Modify LLBadge to allow it to hang off of
 non-buttons

Added the following for increased LLBadge functionality:
 * Panels now choose whether or not they accept buttons as children, which they
   do by default.
 * UI controls now shuffle controls with "requests_front" to the front of their
   children list at postBuild time.
 * Badges are set to "requests_front" by default
 * Badges now accept border image and color attributes

 Reviewed by Callum
---
 indra/newview/skins/default/colors.xml               | 2 +-
 indra/newview/skins/default/xui/en/widgets/badge.xml | 5 ++++-
 indra/newview/skins/default/xui/en/widgets/panel.xml | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index a548849d60..efd2559a55 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -136,7 +136,7 @@
      name="BadgeImageColor"
      value="0.44 0.69 0.56 1.0" />
     <color
-     name="BadgeImageBorderColor"
+     name="BadgeBorderColor"
      value="0.9 0.9 0.9 1.0" />
     <color
      name="BadgeLabelColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml
index ceec09d1e4..f77c4b7178 100644
--- a/indra/newview/skins/default/xui/en/widgets/badge.xml
+++ b/indra/newview/skins/default/xui/en/widgets/badge.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- Additional attributes:
    -->
-<badge font="SansSerifSmall"
+<badge border_image="Badge_Border"
+       border_color="BadgeBorderColor"
+       font="SansSerifSmall"
        image="Badge_Background"
        image_color="BadgeImageColor"
        label_color="BadgeLabelColor"
@@ -10,5 +12,6 @@
        location_percent_vcenter="85"
        padding_horiz="7"
        padding_vert="4"
+       requests_front="true"
        >
 </badge>
diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml
index 9bf99fa363..47a210d9b7 100644
--- a/indra/newview/skins/default/xui/en/widgets/panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/panel.xml
@@ -10,4 +10,5 @@
        bg_alpha_image_overlay="White"
        background_visible="false"
        background_opaque="false"
-       chrome="false"/>
\ No newline at end of file
+       chrome="false"
+       accepts_badge="true"/>
\ No newline at end of file
-- 
cgit v1.2.3


From 173b9d11c41d32c52c4cd64c23e0a5b0f3ef09fc Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 9 Jun 2011 16:38:51 +0300
Subject: STORM-1254 WIP Implemented created and editing local water presets.

---
 .../default/xui/en/floater_edit_water_preset.xml   | 31 ++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

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

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
index 77484bcfea..7d7e170c1e 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
@@ -13,6 +13,7 @@
   <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"
@@ -45,12 +46,14 @@
    	max_chars="100"
    	name="water_preset_combo"
    	top_delta="-5"
-   	width="200">
-      <combo_box.item
-       label="-Select a preset-"
-       name="item0"
-       value="any" />
-    </combo_box>
+   	width="200"/>
+
+   <line_editor
+    height="20"
+    left_delta="0"
+    name="water_preset_name"
+    top_delta="0"
+    width="200" />
    
    <text
    follows="top|left|right"
@@ -115,9 +118,9 @@
     layout="topleft"
     left_delta="-15"
     top_pad="0"
-    name="water_fog_destiny_label"
+    name="water_fog_density_label"
     width="200">
-    	Fog Destiny Exponent
+    	Fog Density Exponent
    </text>
    <slider
     decimal_digits="1"
@@ -127,7 +130,7 @@
     layout="topleft"
     left_delta="15"
     max_val="10"
-    name="fog_destiny_exponent"
+    name="WaterFogDensity"
     top_pad="10"
     width="200"/>
     
@@ -140,7 +143,7 @@
     top_pad="15"
     name="underwater_fog_modifier_label"
     width="200">
-    	Underwater For Modifier
+    	Underwater Fog Modifier
    </text>
    <slider
     decimal_digits="1"
@@ -150,7 +153,7 @@
     layout="topleft"
     left_delta="15"
     max_val="10"
-    name="underwater_fog_modifier"
+    name="WaterUnderWaterFogMod"
     top_pad="10"
     width="200"/>
     
@@ -175,7 +178,7 @@
      layout="topleft"             
      max_val="4"
      min_val="-4"
-     name="water_wave_direction_x"
+     name="WaterWave1DirX"
      top_pad="10"
      width="216"/>    
     <slider
@@ -188,7 +191,7 @@
      layout="topleft"
      max_val="4"
      min_val="-4"
-     name="water_wave_direction_y"
+     name="WaterWave1DirY"
      top_pad="5"
      width="216"/>
     
@@ -421,7 +424,7 @@
 	label="Make this preset my new water setting"
 	layout="topleft"
 	left="430"
-	name="new_water_preset_chb"
+	name="make_default_cb"
 	top_pad="30"
 	width="280"/>
 	
-- 
cgit v1.2.3


From 50393788693578a2fe3a934faa04b382d75f1657 Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Thu, 9 Jun 2011 13:46:19 -0700
Subject: ER-910: Parcel Privacy.  Rename things in code to reflect feature
 name change to "hidden avatars"

---
 .../textures/icons/Parcel_HiddenAVsOff_Dark.png     | Bin 0 -> 730 bytes
 .../textures/icons/Parcel_HiddenAVsOn_Dark.png      | Bin 0 -> 814 bytes
 .../textures/icons/Parcel_PrivacyOff_Dark.png       | Bin 730 -> 0 bytes
 .../textures/icons/Parcel_PrivacyOn_Dark.png        | Bin 814 -> 0 bytes
 indra/newview/skins/default/textures/textures.xml   |   4 ++--
 .../skins/default/xui/en/floater_about_land.xml     |   4 ++--
 .../newview/skins/default/xui/en/notifications.xml  |   8 +++-----
 .../skins/default/xui/en/panel_place_profile.xml    |  20 ++++++++++----------
 .../skins/default/xui/en/panel_topinfo_bar.xml      |   4 ++--
 indra/newview/skins/default/xui/en/strings.xml      |  10 +++++-----
 .../skins/default/xui/en/widgets/location_input.xml |   6 +++---
 11 files changed, 27 insertions(+), 29 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png

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

diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png
new file mode 100644
index 0000000000..8b3376e514
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png
new file mode 100644
index 0000000000..4e474d7f5a
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png
deleted file mode 100644
index 8b3376e514..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png
deleted file mode 100644
index 4e474d7f5a..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index cb20cf3740..e8fe3cd82f 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -369,8 +369,8 @@ with the same filename but different name
  <texture name="Parcel_ScriptsNo_Dark" file_name="icons/Parcel_ScriptsNo_Dark.png" preload="false" />
  <texture name="Parcel_Voice_Dark" file_name="icons/Parcel_Voice_Dark.png" preload="false" />
  <texture name="Parcel_VoiceNo_Dark" file_name="icons/Parcel_VoiceNo_Dark.png" preload="false" />
- <texture name="Parcel_PrivacyOff_Dark" file_name="icons/Parcel_PrivacyOff_Dark.png" preload="false" />
- <texture name="Parcel_PrivacyOn_Dark" file_name="icons/Parcel_PrivacyOn_Dark.png" preload="false" />
+ <texture name="Parcel_HiddenAVsOff_Dark" file_name="icons/Parcel_HiddenAVsOff_Dark.png" preload="false" />
+ <texture name="Parcel_HiddenAVsOn_Dark" file_name="icons/Parcel_HiddenAVsOn_Dark.png" preload="false" />
 
  <texture name="Parcel_BuildNo_Light" file_name="icons/Parcel_BuildNo_Light.png" preload="false" />
  <texture name="Parcel_FlyNo_Light" file_name="icons/Parcel_FlyNo_Light.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index d2567e8197..4ad42ea5bf 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1205,8 +1205,8 @@ Only large parcels can be listed in search.
                 No Pushing (Region Override)
             </panel.string>
             <panel.string
-             name="private_parcel_text">
-                Private Parcel
+             name="hidden_avs_text">
+                Hidden Avatars
             </panel.string>
             <text
              type="string"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c86251bf28..9e3c3a9bac 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5654,14 +5654,12 @@ This area has building disabled. You can&apos;t build or rez objects here.
   </notification>
 
   <notification
-   icon="privacy.tga"
-   name="PrivateParcel"
+   icon="notify.tga"
+   name="HiddenAVs"
    persist="true"
    type="notify"
    unique="true">
-This is a private parcel.   You can&apos;t see 
-others outside the parcel, and those 
-outside are not able to see you.
+This parcel hides avatars from view from another parcel.   You can&apos;t see others outside the parcel, and those outside are not able to see you.
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 26a7ebbb45..9c6ee32d45 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -154,13 +154,13 @@
      translate="false"
      value="Parcel_DamageNo_Dark" />
     <string
-     name="icon_PrivacyOff"
+     name="icon_HiddenAVsOff"
      translate="false"
-     value="Parcel_PrivacyOff_Dark" />
+     value="Parcel_HiddenAVsOff_Dark" />
     <string
-     name="icon_PrivacyOn"
+     name="icon_HiddenAVsOn"
      translate="false"
-     value="Parcel_PrivacyOn_Dark" />
+     value="Parcel_HiddenAVsOn_Dark" />
     <button
      follows="top|left"
      height="24"
@@ -362,7 +362,7 @@
                  title="Parcel">
                     <panel
                      follows="all"
-                     height="175"
+                     height="200"
                      layout="topleft"
                      left="0"
                      name="parcel_characteristics_panel"
@@ -554,10 +554,10 @@
                         <icon
                          follows="top|left"
                          height="18"
-                         image_name="Parcel_PrivacyOff_Dark"
+                         image_name="Parcel_HiddenAVsOff_Dark"
                          layout="topleft"
                          left="10"
-                         name="privacy_icon"
+                         name="hidden_av_icon"
                          top_pad="7"
                          width="22" />
                         <text
@@ -565,15 +565,15 @@
                          height="14"
                          layout="topleft"
                          left_pad="8"
-                         name="privacy_label"
-                         value="Privacy:"
+                         name="hidden_avs_label"
+                         value="Hidden Avatars:"
                          width="90" />
                         <text
                          follows="left|top"
                          height="14"
                          layout="topleft"
                          left_pad="0"
-                         name="privacy_value"
+                         name="hidden_av_value"
                          value="Off"
                          width="60" />
                         <button
diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
index 98cb17bbce..f744e8d4cb 100644
--- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
@@ -91,9 +91,9 @@
   <icon
     follows="right|top"
     height="13"
-    image_name="Parcel_PrivacyOff_Dark"
+    image_name="Parcel_HiddenAVsOff_Dark"
     left="2"
-    name="privacy_icon"
+    name="hidden_av_icon"
     top="3"
     visible="false"
     width="14"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 38cb547982..cc9fde4b81 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1759,10 +1759,10 @@ integer llGetParcelMaxPrims(vector pos, integer sim_wide)
 Returns the maximum number of prims allowed on the parcel at pos
 	</string>
 	<string name="LSLTipText_llGetParcelDetails" translate="false">
-list llGetParcelDetails(vector pos, list params)
-Returns the parcel details specified in params for the parcel at pos.
-Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _PRIVACY
-	</string>
+    list llGetParcelDetails(vector pos, list params)
+    Returns the parcel details specified in params for the parcel at pos.
+    Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _HIDDEN_AVS
+  </string>
 	<string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
 llSetLinkPrimitiveParams(integer linknumber, list rules)
 Sets primitive parameters for linknumber based on rules
@@ -3131,7 +3131,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlAdultIconTooltip">Adult Region</string>
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
-  <string name="LocationCtrlPrivacyTooltip">Private Parcel</string>
+  <string name="LocationCtrlHiddenAVsTooltip">Hidden Avatars Parcel</string>
 
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 5a60576b4a..adb8cf3172 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -123,13 +123,13 @@
 	font="SansSerifSmall"
 	text_color="TextFgColor"
 	/>
-  <privacy_icon
-    name="privacy_icon"
+  <hidden_av_icon
+    name="hidden_av_icon"
     width="22"
     height="18"
     top="21"
     follows="right|top"
-    image_name="Parcel_PrivacyOn_Dark"
+    image_name="Parcel_HiddenAVsOn_Dark"
     />
   <combo_button
 		name="Location History"
-- 
cgit v1.2.3


From 3eeb14ee0abb5720e010d94eba52db09fa32237e Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Fri, 10 Jun 2011 16:20:30 -0700
Subject: EXP-856 FIX -- Inbox item count reflected as badge on inventory
 button

* Modified badges to be parented to their owners if their owners have no parents
* Modified side tray tab panels to create badges on side tab buttons when the
  xml specifies a badge.
* Modified inbox to drive the badge value of the sidebar_inventory button.
* Updated inbox and outbox sizes so scroll bars function as expected
* Updated inventory_panel.xml to allow scroll tag to specify scroll bar
  properties, instead of just having them hardcoded.

Reviewed by Richard
---
 .../skins/default/xui/en/panel_side_tray.xml       |   1 +
 .../skins/default/xui/en/sidepanel_inventory.xml   | 125 +++++++++++----------
 .../default/xui/en/widgets/inventory_panel.xml     |   9 +-
 3 files changed, 74 insertions(+), 61 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 6ef93406ec..0f330a7b98 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -142,6 +142,7 @@
     mouse_opaque="false"
     background_visible="true"
   >
+      <badge location="top_left" location_percent_vcenter="50" location_percent_hcenter="95" />
       <panel
         class="sidepanel_inventory"
         name="sidepanel_inventory"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index c945f27ac6..373a9011a1 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -26,13 +26,13 @@
               top="0"
               orientation="vertical"
               name="inventory_layout_stack"
-             height="535"
+              height="535"
               width="330">
              <layout_panel
                  name="main_inventory_layout_panel"
                  min_dim="150"
                  width="330"
-                  follows="bottom|left|right"
+                 follows="bottom|left|right"
                  user_resize="false"
                  height="480">
                  <panel
@@ -50,12 +50,12 @@
              <layout_panel
                  width="330"
                  auto_resize="true"
-                user_resize="false"
-                  follows="bottom|left|right"
+                 user_resize="false"
+                 follows="bottom|left|right"
                  min_dim="35"
                  name="inbox_layout_panel"
                  max_dim="125"
-                 height="35">
+                 height="125">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -69,59 +69,62 @@
                      <string name="InboxLabelWithArg">MARKETPLACE INBOX ([NUM])</string>
                      <string name="InboxLabelNoArg">MARKETPLACE INBOX</string>
                      <button
-                         label="MARKETPLACE INBOX"
-                         name="inbox_btn"
-                         height="35"
-                         width="308"
-                         image_unselected="MarketplaceBtn_Off"
-                            image_selected="MarketplaceBtn_Selected"
-                         halign="left"
-                         follows="top|left|right"
-                         is_toggle="true"
-                         tab_stop="false"
-                         pad_left="35"
-                         top="0"
+                        label="MARKETPLACE INBOX"
+                        name="inbox_btn"
+                        height="35"
+                        width="308"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        halign="left"
+                        follows="top|left|right"
+                        is_toggle="true"
+                        tab_stop="false"
+                        pad_left="35"
+                        top="0"
                         left="10" />
-                         <panel
-                             follows="all"
-                             left="10"
-                             height="90"
-                             width="308"
-                             top="35"
-                             bg_opaque_color="InventoryBackgroundColor"
-                             background_visible="true"
-                             background_opaque="true"
-                           >
-                             <text
-                                 type="string"
-                                 length="1"
-                                 follows="top|left|right"
-                                 font="SansSerifSmall"
-                                 use_ellipses="true"
-                                 name="move_items_text"
-                                 top="10"
-                                 left="4"
-                                 height="20"
-                                 width="304"
-                                 >Move items to your inventory to manage and use them.</text>
-                             <inventory_panel
-                                bg_opaque_color="DkGray2"
-                                bg_alpha_color="DkGray2"
-                                background_visible="true"
-                                background_opaque="true"
-                                border="false"
-                                bevel_style="none"
-                                follows="all"
-                                height="70"
-                                start_folder="Inbox"
-                                layout="topleft"
-                                left="0"
-                                name="inventory_inbox"
-                                sort_order_setting="InventorySortOrder"
-                                show_item_link_overlays="true"
-                                top_pad="0"
-                                width="308" />   
-                         </panel>
+                     <panel
+                        follows="all"
+                        left="10"
+                        height="90"
+                        width="308"
+                        top="35"
+                        bg_opaque_color="InventoryBackgroundColor"
+                        background_visible="true"
+                        background_opaque="true"
+                    >
+                        <text
+                            type="string"
+                            length="1"
+                            follows="top|left|right"
+                            font="SansSerifSmall"
+                            use_ellipses="true"
+                            name="move_items_text"
+                            top="5"
+                            left="4"
+                            height="20"
+                            width="304"
+                            >Move items to your inventory to manage and use them.</text>
+                        <inventory_panel
+                            bg_opaque_color="DkGray2"
+                            bg_alpha_color="DkGray2"
+                            background_visible="true"
+                            background_opaque="true"
+                            border="false"
+                            bevel_style="none"
+                            follows="all"
+                            top="25"
+                            height="70"
+                            start_folder="Inbox"
+                            layout="topleft"
+                            left="0"
+                            name="inventory_inbox"
+                            sort_order_setting="InventorySortOrder"
+                            show_item_link_overlays="true"
+                            top_pad="0"
+                            width="308">
+                            <scroll reserve_scroll_corner="false" />
+                        </inventory_panel>
+                    </panel>
                  </panel>
              </layout_panel>
              <layout_panel
@@ -132,7 +135,7 @@
                 name="outbox_layout_panel"
                 min_dim="35"
                 max_dim="125"
-                height="35">
+                height="125">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -200,7 +203,7 @@
                      <panel
                          follows="all"
                          left="0"
-                         height="90"
+                         bottom="125"
                          width="330"
                          top="35"
                            >
@@ -220,7 +223,9 @@
                               sort_order_setting="InventorySortOrder"
                               show_item_link_overlays="true"
                               top="0"
-                              width="308" />
+                              width="308">
+                             <scroll reserve_scroll_corner="false" />
+                         </inventory_panel>
                      </panel>
 
                  </panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
index 93875d66e6..3164cc5eba 100644
--- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
@@ -3,4 +3,11 @@
   bg_opaque_color="InventoryBackgroundColor"
   background_visible="true"
   background_opaque="true"
-  />
+  >
+    <scroll
+		name="Inventory Scroller"
+        follows="all"
+		reserve_scroll_corner="true"
+        tab_stop="true"
+        />
+</panel>
-- 
cgit v1.2.3


From 142c2fc29c9645df1bff924d6a61c09f04713a7b Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Tue, 14 Jun 2011 16:35:15 -0700
Subject: EXP-896 FIX -- Inbox not opened by default when new items are
 received EXP-894 FIX -- When scrolling to the bottom of the inbox, the last
 item is c... EXP-856 FIX -- Inbox item count reflected as badge on inventory
 button

* Inbox auto-expands when "fresh" items are reported
* Logic for "fresh" item determination is still in progress but works for purchases while logged in
* Badges now only displayed when the inventory side panel is collapsed or when inventory not visible

Reviewed by Leyla
---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 61 ++++++++++++----------
 1 file changed, 33 insertions(+), 28 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 373a9011a1..9a91f90f79 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -54,8 +54,8 @@
                  follows="bottom|left|right"
                  min_dim="35"
                  name="inbox_layout_panel"
-                 max_dim="125"
-                 height="125">
+                 max_dim="200"
+                 height="200">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -64,12 +64,12 @@
                       class="panel_marketplace_inbox"
                       top="0"
                       label=""
-                      height="125"
+                      height="200"
                       width="330">
-                     <string name="InboxLabelWithArg">MARKETPLACE INBOX ([NUM])</string>
-                     <string name="InboxLabelNoArg">MARKETPLACE INBOX</string>
+                     <string name="InboxLabelWithArg">Received Items ([NUM])</string>
+                     <string name="InboxLabelNoArg">Received Items</string>
                      <button
-                        label="MARKETPLACE INBOX"
+                        label="Received Items"
                         name="inbox_btn"
                         height="35"
                         width="308"
@@ -82,28 +82,33 @@
                         pad_left="35"
                         top="0"
                         left="10" />
+                     <text
+                        type="string"
+                        length="1"
+                        follows="right|top"
+                        layout="topleft"
+                        height="13"
+                        top="10"
+                        right="-20"
+                        name="inbox_fresh_new_count"
+                        font="SansSerifMedium"
+                        halign="right"
+                        text_color="EmphasisColor"
+                        top_pad="0"
+                        width="300">
+                        [NUM] New
+                     </text>
                      <panel
                         follows="all"
                         left="10"
-                        height="90"
+                        bottom="200"
                         width="308"
                         top="35"
                         bg_opaque_color="InventoryBackgroundColor"
                         background_visible="true"
                         background_opaque="true"
-                    >
-                        <text
-                            type="string"
-                            length="1"
-                            follows="top|left|right"
-                            font="SansSerifSmall"
-                            use_ellipses="true"
-                            name="move_items_text"
-                            top="5"
-                            left="4"
-                            height="20"
-                            width="304"
-                            >Move items to your inventory to manage and use them.</text>
+                        tool_tip="Drag and drop items to your inventory to manage and use them"
+                        >
                         <inventory_panel
                             bg_opaque_color="DkGray2"
                             bg_alpha_color="DkGray2"
@@ -112,8 +117,8 @@
                             border="false"
                             bevel_style="none"
                             follows="all"
-                            top="25"
-                            height="70"
+                            top="0"
+                            height="165"
                             start_folder="Inbox"
                             layout="topleft"
                             left="0"
@@ -134,8 +139,8 @@
                 follows="bottom|left|right"
                 name="outbox_layout_panel"
                 min_dim="35"
-                max_dim="125"
-                height="125">
+                max_dim="200"
+                height="200">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -144,10 +149,10 @@
                       class="panel_marketplace_outbox"
                       top="0"
                       label=""
-                      height="125"
+                      height="200"
                       width="310">
                      <button
-                        label="MARKETPLACE OUTBOX"
+                        label="Merchant Outbox"
                         is_toggle="true"
                         name="outbox_btn"
                         follows="top|left|right"
@@ -203,7 +208,7 @@
                      <panel
                          follows="all"
                          left="0"
-                         bottom="125"
+                         bottom="200"
                          width="330"
                          top="35"
                            >
@@ -215,7 +220,7 @@
                               border="false"
                               bevel_style="none"
                               follows="all"
-                              height="90"
+                              height="165"
                               start_folder="Outbox"
                               layout="topleft"
                               left="0"
-- 
cgit v1.2.3


From 64f978dc81cf6b3dad42fc5f1cf3896208efc8ac Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 16 Jun 2011 16:39:30 -0700
Subject: EXP-891 Right click on Inbox or Outbox toggles up down arrow but has
 no action

---
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 2 ++
 indra/newview/skins/default/xui/en/widgets/button.xml      | 1 +
 2 files changed, 3 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 9a91f90f79..1fedd6aab8 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -76,6 +76,7 @@
                         image_unselected="MarketplaceBtn_Off"
                         image_selected="MarketplaceBtn_Selected"
                         halign="left"
+                        handle_right_mouse="false"
                         follows="top|left|right"
                         is_toggle="true"
                         tab_stop="false"
@@ -154,6 +155,7 @@
                      <button
                         label="Merchant Outbox"
                         is_toggle="true"
+                        handle_right_mouse="false"
                         name="outbox_btn"
                         follows="top|left|right"
                         image_unselected="MarketplaceBtn_Off"
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 16241ed84e..302014eb24 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -25,5 +25,6 @@
         pad_bottom="3" 
         height="23"
         scale_image="true"
+        handle_right_mouse="true"
         use_draw_context_alpha="true">
 </button>
-- 
cgit v1.2.3


From 5af57330eb23dd6f00f02bafdf08ee70b5cae50b Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 20 Jun 2011 08:57:57 -0700
Subject: EXP-917 FIX -- Inbox and Outbox options shown in the + Menu in the
 Inventory Panel

Oops.
---
 .../newview/skins/default/xui/en/menu_inventory_add.xml  | 16 ----------------
 1 file changed, 16 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index f38ea04858..e0ccb18c08 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -91,22 +91,6 @@
                  function="Inventory.DoCreate"
                  parameter="category" />
             </menu_item_call>
-            <menu_item_call
-                    label="Inbox"
-                   layout="topleft"
-                    name="Inbox">
-               <menu_item_call.on_click
-     function="Inventory.DoCreate"
-     parameter="inbox" />
-</menu_item_call>
-           <menu_item_call
-                 label="Outbox"
-                 layout="topleft"
-                 name="Outbox">
-             <menu_item_call.on_click
-     function="Inventory.DoCreate"
-     parameter="outbox" />
-</menu_item_call>
             <menu_item_call
              label="New Script"
              layout="topleft"
-- 
cgit v1.2.3


From c0c0a2b9a5f41fc06619330a81c34955a39ddfe2 Mon Sep 17 00:00:00 2001
From: "simon@lindenlab.com" <simon@lindenlab.com>
Date: Mon, 20 Jun 2011 09:28:10 -0700
Subject: ER-944:  Add feature to control user sounds on a parcel.  Added new
 checkboxes to the About Land / Sound tab.  Reviewed by Kelly.

---
 .../skins/default/xui/en/floater_about_land.xml    | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 4ad42ea5bf..612d2a3bfe 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1858,6 +1858,34 @@ Only large parcels can be listed in search.
              name="check sound local"
              left_pad="0"
              width="292" />
+          <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="Avatar Sounds:"
+             top_pad="10"
+             width="100">
+               Avatar Sounds:
+          </text>
+          <check_box
+             height="16"
+             label="Everyone"
+             layout="topleft"
+             left_pad="0"
+             name="all av sound check"
+             top_delta="0"
+             width="130" />
+          <check_box
+             height="16"
+             label="Group"
+             layout="topleft"
+             left_pad="0"
+             name="group av sound check"
+             top_delta="0"
+             width="70" />
             <text
              type="string"
              length="1"
-- 
cgit v1.2.3


From 94687fd05e356499c6708c4df6e11e85d075f992 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 22 Jun 2011 18:36:03 +0300
Subject: STORM-1305 WIP UI changes in the Day Cycle Editor.

- Made the floater smaller.
- Removed the "Control Help" label.
- Removed the view border, added a horizontal separator.
- Added missing vertical line above the rightmost "12 am" label.
---
 .../default/xui/en/floater_edit_day_cycle.xml      | 123 ++++++++++-----------
 1 file changed, 57 insertions(+), 66 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
index 2c78d51c9f..7aae966879 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="450"
+ height="381"
  layout="topleft"
  name="Edit Day cycle"
  help_topic="day_presets"
  save_rect="true"
  title="Edit Day Cycle"
- width="800">
+ width="705">
 
     <string name="title_new">Create a New Day Cycle</string>
     <string name="title_edit">Edit Day Cycle</string>
@@ -19,16 +19,16 @@
      follows="top|left|right"
      height="10"
      layout="topleft"
-     left="30"
+     left="10"
      name="hint"
      top="25"
-     width="700" />
+     width="685" />
     <text
      follows="top|left|right"
      font="SansSerif"
      height="10"
      layout="topleft"
-     left="30"
+     left="10"
      name="label"
      top_pad="25"
      width="120">
@@ -52,42 +52,23 @@
      width="200" />
     <text
      follows="top|left|right"
-     height="40"
+     height="95"
      layout="topleft"
      left_pad="10"
      name="note"
      top_delta="0"
-     width="405"
+     width="345"
      wrap="true">
      Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
     </text>
  <!--======== Controls panel ========-->
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="300"
-     layout="topleft"
-     left="25"
-     name="water_panel"
-     top="100"
-     width="750"/>
-    <text
-     follows="top|left|right"
-     height="10"
-     layout="topleft"
-     name="water_preset_help"
-     right="770"
-     top="104"
-     width="100">
-     Control Help
-    </text>
     <text
      follows="left|top|right"
      height="10"
      layout="topleft"
-     left="40"    
+     left="10"    
      name="water_color_label"
-     top="125"
+     top="100"
      width="300">
      - Click on a tab to edit the specific sky settings and time.
     </text>
@@ -115,8 +96,8 @@
      name="day_cycle_slider_panel"
      layout="topleft"
      left_delta="25"
-     top_pad="25"
-     width="670">
+     top_pad="15"
+     width="660">
         <multi_slider
          can_edit_text="true"
          control_name="WLTimeSlider"
@@ -409,6 +390,7 @@
          name="WL12amHash2"
          top_delta="-3"
          width="6">
+         |
         </text>
     </panel>
     <text
@@ -421,7 +403,7 @@
      layout="topleft"
      left_delta="192"
      name="WLCurKeyTimeText2"
-     top_pad="30"
+     top_pad="10"
      width="80">
         Sky Setting:
     </text>
@@ -456,39 +438,48 @@
      top_delta="-1"
      value="6:00 AM"
      width="75"/> 
-        <loading_indicator
-         height="23"
-         layout="topleft"
-         left="25"
-         name="progress_indicator"
-         top="417"
-         visible="false"
-         width="23" />
-        <check_box
-         follows="top|left"
-         height="10"
-         label="Make this my new day cycle"
-         layout="topleft"
-         left="330"
-         name="make_default_cb"
-         top="430"
-         width="280"/>
-        <button
-         follows="bottom|right"
-         height="23"
-         label="Save"
-         layout="topleft"
-         left_pad="0"
-         name="save"
-         top="417"
-         width="70"/>
-        <button
-         follows="bottom|right"
-         height="23"
-         label="Cancel"
-         layout="topleft"
-         left_pad="15"
-         name="cancel"
-         top_delta="0"
-         width="70"/>
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="0"
+     layout="topleft"
+     left="10"
+     name="horiz_separator"
+     top_pad="20"
+     width="685"/>
+    <loading_indicator
+     height="23"
+     layout="topleft"
+     left="25"
+     name="progress_indicator"
+     top="350"
+     visible="false"
+     width="23" />
+    <check_box
+     follows="top|left"
+     height="10"
+     label="Make this my new day cycle"
+     layout="topleft"
+     left="310"
+     name="make_default_cb"
+     top_delta="13"
+     width="230"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Save"
+     layout="topleft"
+     left_pad="0"
+     name="save"
+     top_delta="-13"
+     width="70"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     left_pad="15"
+     name="cancel"
+     top_delta="0"
+     width="70"/>
  </floater>
-- 
cgit v1.2.3


From 663102b5727cdd566f35a1fe5d113207ac75da62 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 22 Jun 2011 21:17:31 +0300
Subject: STORM-1305 WIP UI changes in the Edit Water Preset floater.

- Made the floater smaller.
- Removed the "Control Help" label.
- Removed the view border, added a horizontal separator.
- Fixed the color swatch to only handle mouse within the color box.
---
 .../default/xui/en/floater_edit_water_preset.xml   | 118 ++++++++++-----------
 1 file changed, 59 insertions(+), 59 deletions(-)

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

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
index 7d7e170c1e..905983e7fa 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="450"
+ height="375"
  layout="topleft"
  name="Edit Water Preset"
  help_topic="water_preset"
  save_rect="true"
  title="Edit Water Preset"
- width="900">
+ width="725">
 
   <string name="title_new">Create a New Water Preset</string>
   <string name="title_edit">Edit a Water Preset</string>
@@ -22,7 +22,7 @@
    left="30"
    name="hint"
    top="25"
-   width="700">
+   width="680">
    	To edit your preset, adjust the controls then click "Save"
    </text>
    
@@ -62,49 +62,40 @@
    left_pad="10"
    name="note"
    top_delta="0"
-   width="405"
+   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="true"
- bevel_style="none"
- follows="top|left"
- height="300"
- layout="topleft"
- left="25"
- name="panel_water_preset"
- top="100"
- width="850">
+  border="false"
+  bevel_style="none"
+  follows="top|left"
+  height="230"
+  layout="topleft"
+  left="10"
+  name="panel_water_preset"
+  top="100"
+  width="700">
  
-  <text
-   follows="top|left|right"
-   layout="topleft"
-   name="water_preset_help"
-   right="870"
-   top_pad="4"
-   width="100">
-   Control Help
-   </text>
-
 <!--======== I conlumn of controls ========-->   
    <text
     follows="left|top|right"
     height="10"
     font="SansSerif"
     layout="topleft"
-    left="40"    
+    left="10"    
     name="water_color_label"
-    top="25"
-    width="200">
+    top="5"
+    width="215">
        Water Fog Color
    </text>
    <color_swatch
     can_apply_immediately="true"
     follows="left|top"
-    height="60"
+    height="37"
+    label_height="0"
     layout="topleft"
     left_delta="15"
     name="WaterFogColor"
@@ -117,9 +108,9 @@
     font="SansSerif"
     layout="topleft"
     left_delta="-15"
-    top_pad="0"
+    top_pad="10"
     name="water_fog_density_label"
-    width="200">
+    width="215">
     	Fog Density Exponent
    </text>
    <slider
@@ -142,7 +133,7 @@
     left_delta="-15"
     top_pad="15"
     name="underwater_fog_modifier_label"
-    width="200">
+    width="215">
     	Underwater Fog Modifier
    </text>
    <slider
@@ -165,7 +156,7 @@
      left_delta="-15"
      name="BHText"
      top_pad="15"
-     width="200">
+     width="215">
         Big Wave Direction
     </text>    
     <slider
@@ -202,10 +193,10 @@
      font="SansSerif"
      height="10"
      layout="topleft"
-     left_pad="55"
+     left_pad="20"
      name="BDensText"
-     top="25"
-     width="200">
+     top="5"
+     width="215">
         Reflection Wavelet Scale
     </text>
     <slider
@@ -248,7 +239,7 @@
      left_delta="-15"
      name="HDText"
      top_pad="16"
-     width="200">
+     width="215">
         Fresnel Scale
     </text>
     <slider
@@ -270,7 +261,7 @@
      left_delta="-15"
      name="FresnelOffsetText"
      top_pad="15"
-     width="200">
+     width="215">
         Fresnel Offset
     </text>
     <slider
@@ -293,7 +284,7 @@
       left_delta="-15"
       name="BHText2"
       top_pad="15"
-      width="200">
+      width="215">
          Little Wave Direction
      </text>
      <slider
@@ -328,12 +319,12 @@
 	 <text
       follows="left|top|right"
       font="SansSerif"
-      height="10"
+      height="16"
       layout="topleft"
-      left_pad="55"
+      left_pad="20"
       name="DensMultText"
-      top="25"
-      width="200">
+      top="5"
+      width="215">
          Refract Scale Above
      </text>
      <slider
@@ -345,7 +336,7 @@
       layout="topleft"
       left_delta="15"
       name="WaterScaleAbove"
-      top_pad="10"
+      top_pad="5"
       width="200" />
      
      <text
@@ -358,7 +349,7 @@
       left_delta="-15"
       name="WaterScaleBelowText"
       top_pad="15"
-      width="200">
+      width="215">
          Refract Scale Below
      </text>
      <slider
@@ -371,7 +362,7 @@
       layout="topleft"
       left_delta="15"
       name="WaterScaleBelow"
-      top_pad="10"
+      top_pad="5"
       width="200"/>
      
      <text
@@ -382,7 +373,7 @@
       left_delta="-15"
       name="MaxAltText"
       top_pad="15"
-      width="200">
+      width="215">
          Blur Multiplier
      </text>
      <slider
@@ -395,39 +386,48 @@
       left_delta="15"
       max_val="0.16"
       name="WaterBlurMult"
-      top_pad="10"
+      top_pad="5"
       width="200"/>
       
       <text
        follows="left|top|right"
        font="SansSerif"
-       height="10"
+       height="16"
        layout="topleft"
        left_delta="-15"
        name="BHText3"
        top_pad="15"
-       width="200">
+       width="215">
           Normal Map
       </text>
       <texture_picker
-       height="100"
+       height="80"
        layout="topleft"
        left_delta="15"
        name="WaterNormalMap"
-       top_delta="22"
+       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="430"
-	name="make_default_cb"
-	top_pad="30"
-	width="280"/>
-	
+	 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"
-- 
cgit v1.2.3


From 4267014b146798cabe96568b2091c6bb2dd2b294 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Wed, 22 Jun 2011 17:35:25 -0400
Subject: EXP-890 FIX -- Resizing inbox or outbox to minimum size while open
 does not show present items when hte box is next opened EXP-897 FIX -- Black
 box shown in UI when shrinking Inbox down in size

* Layout panel now supports "expanded_min_dim" parameter which allows a different min
  size to be specified when the layout panel is collapsed vs expanded.
* Inbox and Outbox expanded_min_dim attributes are now set to be larger than min dim
  so they can not be collapsed all the way when they are expanded.
---
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 1fedd6aab8..00f3135035 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -52,9 +52,10 @@
                  auto_resize="true"
                  user_resize="false"
                  follows="bottom|left|right"
-                 min_dim="35"
                  name="inbox_layout_panel"
+                 min_dim="35"
                  max_dim="200"
+				 expanded_min_dim="90"
                  height="200">
                  <panel
                       follows="all"
@@ -141,6 +142,7 @@
                 name="outbox_layout_panel"
                 min_dim="35"
                 max_dim="200"
+				expanded_min_dim="90"
                 height="200">
                  <panel
                       follows="all"
-- 
cgit v1.2.3


From e74f9fcc147edd24576a25bb6a0af69ac8d6a600 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 23 Jun 2011 18:11:55 -0400
Subject: EXP-919 FIX -- Toggling InventoryDisplayInbox value to True in Viewer
 on Agni creates Inbox and Outbox system folders

* The badge no longer displays (2) when the folder does not exist.
* The inbox panel no longer displays the inventory and library folders.
* The inbox is supposed to display a string for the item not being found, but doesn't for an unknown reason.
---
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 00f3135035..778daac83b 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -69,6 +69,7 @@
                       width="330">
                      <string name="InboxLabelWithArg">Received Items ([NUM])</string>
                      <string name="InboxLabelNoArg">Received Items</string>
+					 <string name="InboxNoItems">Items purchased through the marketplace will be delivered here.</string>
                      <button
                         label="Received Items"
                         name="inbox_btn"
-- 
cgit v1.2.3


From 398019ffb2a036813c6c89a677e9534faa178330 Mon Sep 17 00:00:00 2001
From: "simon@lindenlab.com" <simon@lindenlab.com>
Date: Mon, 27 Jun 2011 10:11:57 -0700
Subject: ER-910: Parcel privacy.  Got new icons, cleaned up xml linkage a bit.

---
 .../textures/icons/Parcel_HiddenAVsOff_Dark.png        | Bin 730 -> 3011 bytes
 .../default/textures/icons/Parcel_HiddenAVsOn_Dark.png | Bin 814 -> 3194 bytes
 .../textures/icons/Parcel_HiddenAVsOn_Light.png        | Bin 0 -> 3189 bytes
 indra/newview/skins/default/textures/textures.xml      |   1 +
 .../newview/skins/default/xui/en/panel_topinfo_bar.xml |   2 +-
 .../skins/default/xui/en/widgets/location_input.xml    |   2 +-
 6 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png

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

diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png
index 8b3376e514..064687ed0f 100644
Binary files a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png and b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png
index 4e474d7f5a..956e02b14d 100644
Binary files a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png and b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png
new file mode 100644
index 0000000000..434caeda8b
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index e8fe3cd82f..e63e25b308 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -371,6 +371,7 @@ with the same filename but different name
  <texture name="Parcel_VoiceNo_Dark" file_name="icons/Parcel_VoiceNo_Dark.png" preload="false" />
  <texture name="Parcel_HiddenAVsOff_Dark" file_name="icons/Parcel_HiddenAVsOff_Dark.png" preload="false" />
  <texture name="Parcel_HiddenAVsOn_Dark" file_name="icons/Parcel_HiddenAVsOn_Dark.png" preload="false" />
+ <texture name="Parcel_HiddenAVsOn_Light" file_name="icons/Parcel_HiddenAVsOn_Light.png" preload="false" />
 
  <texture name="Parcel_BuildNo_Light" file_name="icons/Parcel_BuildNo_Light.png" preload="false" />
  <texture name="Parcel_FlyNo_Light" file_name="icons/Parcel_FlyNo_Light.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
index f744e8d4cb..d9a0eb884c 100644
--- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
@@ -91,7 +91,7 @@
   <icon
     follows="right|top"
     height="13"
-    image_name="Parcel_HiddenAVsOff_Dark"
+    image_name="Parcel_HiddenAVsOn_Light"
     left="2"
     name="hidden_av_icon"
     top="3"
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index adb8cf3172..6041d750da 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -129,7 +129,7 @@
     height="18"
     top="21"
     follows="right|top"
-    image_name="Parcel_HiddenAVsOn_Dark"
+    image_name="Parcel_HiddenAVsOn_Light"
     />
   <combo_button
 		name="Location History"
-- 
cgit v1.2.3


From b5be90d0d2f26792f0044286f9b64126446dc101 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 28 Jun 2011 16:59:09 +0300
Subject: STORM-1345 FIXED Replaced sliders with color pickers in the Edit Sky
 Preset floater.

TODO: Find out why the color picker widget has higher precision than the old sliders, and decide whether to "fix" that.
---
 .../default/xui/en/floater_edit_sky_preset.xml     | 275 +++------------------
 1 file changed, 32 insertions(+), 243 deletions(-)

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

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
index 64fbaf6b99..0ea32f61b8 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -120,58 +120,16 @@
          width="200">
            Blue Horizon
         </text>
-        <slider
-         control_name="WLBlueHorizonR"
-         decimal_digits="2"
+        <color_swatch
+         can_apply_immediately="true"
          follows="left|top"
-         height="10"
-         increment="0.01"
-         initial_value="0.7"
-         label="R"
+         height="37"
+         label_height="0"
          layout="topleft"
          left_delta="0"
+         name="WLBlueHorizon"
          top_pad="6"
-         name="WLBlueHorizonR"
-         width="200" />
-        <slider
-         control_name="WLBlueHorizonG"
-         decimal_digits="2"
-         follows="left|top"
-         height="10"
-         increment="0.01"
-         initial_value="0.7"
-         label="G"
-         layout="topleft"
-         left_delta="0"
-         name="WLBlueHorizonG"
-         top_pad="6"
-         width="200" />
-        <slider
-         control_name="WLBlueHorizonB"
-         decimal_digits="2"
-         follows="left|top"
-         height="10"
-         increment="0.01"
-         initial_value="0.7"
-         label="B"
-         layout="topleft"
-         name="WLBlueHorizonB"
-         left_delta="0"
-         top_pad="6"
-         width="200" />
-        <slider
-         control_name="WLBlueHorizonI"
-         decimal_digits="2"
-         follows="left|top"
-         height="10"
-         increment="0.01"
-         initial_value="1.0"
-         label="I"
-         layout="topleft"
-         name="WLBlueHorizonI"
-         left_delta="0"
-         top_pad="6"
-         width="200" />
+         width="60" />
         <text
          type="string"
          length="1"
@@ -193,7 +151,7 @@
          increment="0.01"
          initial_value="0.25"
          layout="topleft"
-         left_delta="15"
+         left_delta="0"
          top_pad="6"
          name="WLHazeHorizon"
          width="200" />
@@ -213,58 +171,16 @@
          width="200">
             Blue Density
         </text>
-        <slider
-         control_name="WLBlueDensityR"
-         decimal_digits="2"
-         follows="left|top"
-         height="10"
-         increment="0.01"
-         initial_value="0.7"
-         label="R"
-         layout="topleft"
-         left_delta="0"
-         top_pad="6"
-         name="WLBlueDensityR"
-         width="200" />
-        <slider
-         control_name="WLBlueDensityG"
-         decimal_digits="2"
+        <color_swatch
+         can_apply_immediately="true"
          follows="left|top"
-         height="10"
-         increment="0.01"
-         initial_value="0.7"
-         label="G"
+         height="37"
+         label_height="0"
          layout="topleft"
          left_delta="0"
-         name="WLBlueDensityG"
+         name="WLBlueDensity"
          top_pad="6"
-         width="200" />
-        <slider
-         control_name="WLBlueDensityB"
-         decimal_digits="2"
-         follows="left|top"
-         height="10"
-         increment="0.01"
-         initial_value="0.7"
-         label="B"
-         layout="topleft"
-         left_delta="0"
-         name="WLBlueDensityB"
-         top_pad="6"
-         width="200" />
-        <slider
-         control_name="WLBlueDensityI"
-         decimal_digits="2"
-         follows="left|top"
-         height="10"
-         increment="0.01"
-         initial_value="1"
-         label="I"
-         layout="topleft"
-         left_delta="0"
-         name="WLBlueDensityI"
-         top_pad="6"
-         width="200" />
+         width="60" />
         <text
          type="string"
          length="1"
@@ -286,7 +202,7 @@
          increment="0.01"
          initial_value="0.7"
          layout="topleft"
-         left_delta="-15"
+         left_delta="0"
          max_val="4"
          name="WLHazeDensity"
          top_pad="6"
@@ -401,58 +317,16 @@
              width="200">
                 Sun/Moon Color
             </text>
-            <slider
-             control_name="WLSunlightR"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             label="R"
-             layout="topleft"
-             left_delta="0"
-             top_pad="6"
-             name="WLSunlightR"
-             width="200" />
-            <slider
-             control_name="WLSunlightG"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             label="G"
-             layout="topleft"
-             left_delta="0"
-             name="WLSunlightG"
-             top_pad="6"
-             width="200" />
-            <slider
-             control_name="WLSunlightB"
-             decimal_digits="2"
+            <color_swatch
+             can_apply_immediately="true"
              follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             label="B"
+             height="37"
+             label_height="0"
              layout="topleft"
              left_delta="0"
-             name="WLSunlightB"
+             name="WLSunlight"
              top_pad="6"
-             width="200" />
-            <slider
-             control_name="WLSunlightI"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             label="I"
-             left_delta="0"
-             name="WLSunlightI"
-             top_pad="6"
-             width="200" />
+             width="60" />
             <text
              type="string"
              length="1"
@@ -502,58 +376,16 @@
              width="200">
                 Ambient
             </text>
-            <slider
-             control_name="WLAmbientR"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             label="R"
-             layout="topleft"
-             left_delta="0"
-             top_pad="6"
-             name="WLAmbientR"
-             width="200" />
-            <slider
-             control_name="WLAmbientG"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             label="G"
-             layout="topleft"
-             left_delta="0"
-             name="WLAmbientG"
-             top_pad="6"
-             width="200" />
-            <slider
-             control_name="WLAmbientB"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             label="B"
-             layout="topleft"
-             left_delta="0"
-             name="WLAmbientB"
-             top_pad="6"
-             width="200" />
-            <slider
-             control_name="WLAmbientI"
-             decimal_digits="2"
+            <color_swatch
+             can_apply_immediately="true"
              follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="1"
-             label="I"
+             height="37"
+             label_height="0"
              layout="topleft"
              left_delta="0"
-             name="WLAmbientI"
+             name="WLAmbient"
              top_pad="6"
-             width="200" />
+             width="60" />
             <text
              type="string"
              length="1"
@@ -707,59 +539,16 @@
              width="200">
                 Cloud Color
             </text>
-            <slider
-             control_name="WLCloudColorR"
-             decimal_digits="2"
+            <color_swatch
+             can_apply_immediately="true"
              follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             label="R"
-             layout="topleft"
-             left_delta="0"
-             top_pad="6"
-             name="WLCloudColorR"
-             width="200" />
-            <slider
-             control_name="WLCloudColorG"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             label="G"
+             height="37"
+             label_height="0"
              layout="topleft"
              left_delta="0"
-             name="WLCloudColorG"
+             name="WLCloudColor"
              top_pad="6"
-             width="200" />
-            <slider
-             control_name="WLCloudColorB"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             label="B"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudColorB"
-             top_pad="6"
-             width="200" />
-            <slider
-             control_name="WLCloudColorI"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             label="I"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudColorI"
-             top_pad="6"
-             width="200" />
-            
+             width="60" />
             <text
              type="string"
              length="1"
-- 
cgit v1.2.3


From 76acc754370580e7e60ac2a929e165b79c24a7c3 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 29 Jun 2011 23:48:36 +0300
Subject: STORM-1305 WIP Edit Sky floater UI changes.

* Implemented new layout (made the floater smaller, moved widgets around).
* Implemented new sun phase slider, bound to 24h time.
---
 .../default/xui/en/floater_edit_sky_preset.xml     | 222 +++++++++++----------
 1 file changed, 120 insertions(+), 102 deletions(-)

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

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
index 0ea32f61b8..a0a66ca1cd 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -7,7 +7,7 @@
  help_topic="sky_preset"
  save_rect="true"
  title="Edit Sky Preset"
- width="900">
+ width="840">
 
     <string name="title_new">Create a New Sky Preset</string>
     <string name="title_edit">Edit Sky Preset</string>
@@ -66,12 +66,13 @@
     <view_border
      bevel_style="none"
      follows="top|left"
-     height="225"
+     height="203"
      layout="topleft"
      left="25"
      name="panel_water_preset"
-     top="100"
-     width="850"/>
+     top="122"
+     visible="true"
+     width="790"/>
     <tab_container
      follows="left|top"
      height="225"
@@ -81,16 +82,7 @@
      name="WindLight Tabs"
      tab_position="top"
      top="101"
-     width="854">
-    <text
-     follows="top|left|right"
-     layout="topleft"
-     name="water_preset_help"
-     right="870"
-     top_pad="4"
-     width="100">
-        Control Help
-    </text>
+     width="794">
     <panel
      border="true"
      bevel_style="none"
@@ -99,8 +91,8 @@
      label="ATMOSPHERE"
      layout="topleft"
      left="1"
-     mouse_opaque="false"
      help_topic="sky_preset_atmosphere"
+     mouse_opaque="false"
      name="Atmosphere"
      top="60"
      width="698">
@@ -311,10 +303,10 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left="40"
+             left="20"
              name="SLCText"
              top="25"
-             width="200">
+             width="150">
                 Sun/Moon Color
             </text>
             <color_swatch
@@ -323,7 +315,7 @@
              height="37"
              label_height="0"
              layout="topleft"
-             left_delta="0"
+             left_delta="10"
              name="WLSunlight"
              top_pad="6"
              width="60" />
@@ -334,46 +326,10 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
-             name="TODText"
-             top_pad="20"
-             width="200">
-                Sun/Moon Position
-            </text>
-            <icon
-             height="20"
-             image_name="icon_diurnal.tga"
-             layout="topleft"
-             left_delta="14"
-             top_pad="10"
-             name="SkyDayCycle"
-             use_draw_context_alpha="false"
-             width="148" />
-            <slider
-             control_name="WLSunAngle"
-             follows="left|top"
-             height="10"
-             increment="0.001"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="-8"
-             name="WLSunAngle"
-             top_pad="0"
-             width="207" />
-
-            <!--======== Tab Panel II. II conlumn of controls ========-->
-
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_pad="55"
+             left_delta="-10"
              name="WLAmbientText"
-             top="25"
-             width="200">
+             top_pad="20"
+             width="150">
                 Ambient
             </text>
             <color_swatch
@@ -382,38 +338,12 @@
              height="37"
              label_height="0"
              layout="topleft"
-             left_delta="0"
+             left_delta="10"
              name="WLAmbient"
              top_pad="6"
              width="60" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="WLEastAngleText"
-             top_pad="20"
-             width="200">
-                East Angle
-            </text>
-            <slider
-             control_name="WLEastAngle"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.0"
-             layout="topleft"
-             left_delta="15"
-             name="WLEastAngle"
-             top_pad="6"
-             width="200" />
-
-            <!--======== Tab Panel II. III conlumn of controls ========-->
 
+            <!--======== Tab Panel II. II conlumn of controls ========-->
             <text
              type="string"
              length="1"
@@ -421,7 +351,7 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_pad="55"
+             left_pad="100"
              name="SunGlowText"
              top="25"
              width="200">
@@ -436,7 +366,7 @@
              initial_value="0.1"
              label="Focus "
              layout="topleft"
-             left_delta="0"
+             left_delta="10"
              max_val="0.5"
              name="WLGlowB"
              top_pad="6"
@@ -463,7 +393,33 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             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">
@@ -477,12 +433,14 @@
              increment="0.01"
              initial_value="2.0"
              layout="topleft"
-             left_delta="0"
+             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"
@@ -490,25 +448,85 @@
              font="SansSerif"
              height="16"
              layout="topleft"
+             left_pad="60"
+             name="TODText"
+             top="10"
+             width="200">
+                Sun/Moon Position
+            </text>
+            <icon
+             height="20"
+             image_name="icon_diurnal.tga"
+             layout="topleft"
+             left_delta="14"
+             top_pad="10"
+             name="SkyDayCycle"
+             use_draw_context_alpha="false"
+             width="148" />
+            <slider
+             control_name="WLSunAngle"
+             follows="left|top"
+             height="10"
+             increment="0.001"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="-8"
+             name="WLSunAngle"
+             top_pad="0"
+             width="207" />
+            <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"
-             name="WLStarText"
-             top_pad="20"
+             max_sliders="1"
+             max_val="24"
+             name="WLSunPos"
+             show_text="false"
+             top_pad="0"
+             width="300" />
+            <time
+             follows="left|top"
+             height="16"
+             label_width="0"
+             layout="topleft"
+             left_delta="80"
+             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="-80"
+             name="WLEastAngleText"
+             top_pad="40"
              width="200">
-                Star Brightness
+                East Angle
             </text>
             <slider
-             control_name="WLStarAlpha"
+             control_name="WLEastAngle"
              decimal_digits="2"
-             follows="top|left"
+             follows="left|top"
              height="10"
              increment="0.01"
-             initial_value="0"
+             initial_value="0.0"
              layout="topleft"
-             left_delta="0"
-             max_val="2"
-             name="WLStarAlpha"
+             left_delta="10"
+             name="WLEastAngle"
              top_pad="6"
              width="200" />
+
         </panel>
         <panel
          border="true"
@@ -613,7 +631,7 @@
              layout="topleft"
              left_pad="55"
              name="WLCloudCoverageText"
-             top="25"
+             top="15"
              width="200">
                 Cloud Coverage
             </text>
@@ -720,7 +738,7 @@
              layout="topleft"
              left_pad="55"
              name="WLCloudScrollXText"
-             top="25"
+             top="15"
              width="150">
                 Cloud Scroll X
             </text>
@@ -793,7 +811,7 @@
      height="10"
      label="Make this preset my new sky setting"
      layout="topleft"
-     left="430"
+     left="380"
      name="make_default_cb"
      top_pad="30"
      width="280"/>
-- 
cgit v1.2.3


From 3be8ae9d4274ca16ff2dbf8fa10a23f48c2e7022 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 30 Jun 2011 01:19:14 +0300
Subject: STORM-1305 WIP Edit Sky floater: removed the old sun position slider,
 added hour marks to the new one.

---
 .../default/xui/en/floater_edit_sky_preset.xml     | 167 ++++++++++++++++++---
 1 file changed, 143 insertions(+), 24 deletions(-)

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

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
index a0a66ca1cd..56233d91ee 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -450,30 +450,10 @@
              layout="topleft"
              left_pad="60"
              name="TODText"
-             top="10"
+             top="25"
              width="200">
                 Sun/Moon Position
             </text>
-            <icon
-             height="20"
-             image_name="icon_diurnal.tga"
-             layout="topleft"
-             left_delta="14"
-             top_pad="10"
-             name="SkyDayCycle"
-             use_draw_context_alpha="false"
-             width="148" />
-            <slider
-             control_name="WLSunAngle"
-             follows="left|top"
-             height="10"
-             increment="0.001"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="-8"
-             name="WLSunAngle"
-             top_pad="0"
-             width="207" />
             <multi_slider
              can_edit_text="true"
              control_name="WLSunPos"
@@ -490,12 +470,151 @@
              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="80"
+             left_delta="-175"
              name="WLDayTime"
              top_pad="15"
              value="6:00 AM"
@@ -508,9 +627,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-80"
+             left_delta="-106"
              name="WLEastAngleText"
-             top_pad="40"
+             top_pad="24"
              width="200">
                 East Angle
             </text>
-- 
cgit v1.2.3


From e4cd80fabeb67e2112d5485de7c4b08d0d83dd54 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 29 Jun 2011 21:13:56 -0400
Subject: STORM-1462 [TRANSLATED BUT IN EN] ALL LANGS - Untranslated "Cancel"
 button on Edit Pick page This affected all languages but NL due to
 name="layout_panel1" not being unique.

---
 indra/newview/skins/default/xui/da/panel_edit_pick.xml | 2 +-
 indra/newview/skins/default/xui/de/panel_edit_pick.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_edit_pick.xml | 2 +-
 indra/newview/skins/default/xui/es/panel_edit_pick.xml | 2 +-
 indra/newview/skins/default/xui/fr/panel_edit_pick.xml | 2 +-
 indra/newview/skins/default/xui/it/panel_edit_pick.xml | 2 +-
 indra/newview/skins/default/xui/ja/panel_edit_pick.xml | 2 +-
 indra/newview/skins/default/xui/pl/panel_edit_pick.xml | 2 +-
 indra/newview/skins/default/xui/pt/panel_edit_pick.xml | 2 +-
 indra/newview/skins/default/xui/zh/panel_edit_pick.xml | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/da/panel_edit_pick.xml b/indra/newview/skins/default/xui/da/panel_edit_pick.xml
index fd287b1a0a..3036f30240 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Gem valgte" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Annullér" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_pick.xml b/indra/newview/skins/default/xui/de/panel_edit_pick.xml
index 3c56df763d..aafffc7ae3 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Auswahl speichern" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Abbrechen" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 82dfb445da..2ec2e03e8c 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -220,7 +220,7 @@
 			  height="23"
 			  layout="topleft"
 			  left_pad="4"
-			  name="layout_panel1"
+			  name="layout_panel2"
 		      user_resize="false" 
 		      auto_resize="true"
 			  width="146">
diff --git a/indra/newview/skins/default/xui/es/panel_edit_pick.xml b/indra/newview/skins/default/xui/es/panel_edit_pick.xml
index 9b101ee4ba..cda465da9c 100644
--- a/indra/newview/skins/default/xui/es/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Guardar" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Cancelar" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
index 2364d9bbb2..247e18da82 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Enregistrer" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Annuler" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_pick.xml b/indra/newview/skins/default/xui/it/panel_edit_pick.xml
index 8e464ca037..145b8cf4e3 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Salva luogo preferito" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Annulla" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
index 4fb031b677..39ea1df1e3 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="ピックを保存" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="取り消し" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
index 8a183c00cf..72c162f63d 100644
--- a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Zapisz obrazek" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Cofnij" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
index 432affcf09..5eb9987e71 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Salvar destaque" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Cancelar" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
index 6ac7226185..a624877ab3 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="儲存精選地點" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="取消" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
-- 
cgit v1.2.3


From 5c77e714a6febf9df23d8541064e0d2fe680ccce Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 30 Jun 2011 18:32:44 +0300
Subject: STORM-1445 FIXED Added border line to Estate, Environment tabs in
 Region/Estate Floater.

---
 indra/newview/skins/default/xui/en/panel_region_environment.xml | 1 +
 indra/newview/skins/default/xui/en/panel_region_estate.xml      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 5bcc19356d..aa38c49fae 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <panel
+ border="true"
  follows="top|left"
  height="300"
  label="Environment"
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 32714b68d6..450853993a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- border="false"
+ border="true"
  follows="top|left"
  height="510"
  help_topic="panel_region_estate_tab"
-- 
cgit v1.2.3


From 6c12a5ca550e06730e06d1a909fbf43d7bda16f5 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 30 Jun 2011 16:25:19 -0700
Subject: EXP-919 FIX -- Items not shown in Received Items panel EXP-929 FIX --
 First Direct Delivery item purchased while logged in: Received Items folder
 visible in inventory and item not visible in Received items panel - no badge
 count update

* Inbox and Outbox inventory panels now live in their own XML files and are hot loaded into place when appropriate, like when the "Received Items" folder is first created, for example.
* The Inbox and Outbox panels now show relevant default messages when the folders are empty or do not exist
* Added LLInventoryCategoryAddedObserver, a new inventory observer type to observe added folders
* Hacked LLInventoryPanel to properly set up inbox and outbox inventory views for the "Received Items" folder and the "Merchant Outbox" folder that aren't created with the proper system folder type
* Changed inventory badge count computation to use LLFolderView rather than the inventory directly
* Applied various focus, selection and other inbox fixes to the outbox

Reviewed by Richard.
---
 .../skins/default/xui/en/panel_inbox_inventory.xml | 17 +++++
 .../default/xui/en/panel_outbox_inventory.xml      | 17 +++++
 .../skins/default/xui/en/sidepanel_inventory.xml   | 85 ++++++++++------------
 indra/newview/skins/default/xui/en/strings.xml     |  2 +
 4 files changed, 73 insertions(+), 48 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_outbox_inventory.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
new file mode 100644
index 0000000000..49abbcde71
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    name="inventory_inbox"
+    start_folder="Inbox"
+    follows="all" layout="topleft"
+    top="0" left="0" height="165" width="308"
+	top_pad="0"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    background_opaque="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true"
+    >
+    <scroll reserve_scroll_corner="false" />
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
new file mode 100644
index 0000000000..af32056428
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    name="inventory_outbox"
+    start_folder="Outbox"
+    follows="all" layout="topleft"
+    top="0" left="0" height="165" width="308"
+	top_pad="0"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    background_opaque="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true"
+    >
+    <scroll reserve_scroll_corner="false" />
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 778daac83b..baf37ae0b4 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -69,7 +69,6 @@
                       width="330">
                      <string name="InboxLabelWithArg">Received Items ([NUM])</string>
                      <string name="InboxLabelNoArg">Received Items</string>
-					 <string name="InboxNoItems">Items purchased through the marketplace will be delivered here.</string>
                      <button
                         label="Received Items"
                         name="inbox_btn"
@@ -112,26 +111,19 @@
                         background_opaque="true"
                         tool_tip="Drag and drop items to your inventory to manage and use them"
                         >
-                        <inventory_panel
-                            bg_opaque_color="DkGray2"
-                            bg_alpha_color="DkGray2"
-                            background_visible="true"
-                            background_opaque="true"
-                            border="false"
-                            bevel_style="none"
-                            follows="all"
-                            top="0"
-                            height="165"
-                            start_folder="Inbox"
-                            layout="topleft"
-                            left="0"
-                            name="inventory_inbox"
-                            sort_order_setting="InventorySortOrder"
-                            show_item_link_overlays="true"
-                            top_pad="0"
-                            width="308">
-                            <scroll reserve_scroll_corner="false" />
-                        </inventory_panel>
+                        <text
+							name="inbox_inventory_placeholder"
+							type="string"
+							follows="all"
+							layout="topleft"
+							top="0"
+							left="0"
+							width="308"
+							height="165"
+							wrap="true"
+							halign="center">
+							Purchases from the marketplace will be delivered here.
+						</text>
                     </panel>
                  </panel>
              </layout_panel>
@@ -211,33 +203,30 @@
                          </images>
                      </loading_indicator>
                      <panel
-                         follows="all"
-                         left="0"
-                         bottom="200"
-                         width="330"
-                         top="35"
-                           >
-                         <inventory_panel
-                              bg_opaque_color="DkGray2"
-                              bg_alpha_color="DkGray2"
-                              background_visible="true"
-                              background_opaque="true"
-                              border="false"
-                              bevel_style="none"
-                              follows="all"
-                              height="165"
-                              start_folder="Outbox"
-                              layout="topleft"
-                              left="0"
-                              name="inventory_outbox"
-                              sort_order_setting="InventorySortOrder"
-                              show_item_link_overlays="true"
-                              top="0"
-                              width="308">
-                             <scroll reserve_scroll_corner="false" />
-                         </inventory_panel>
-                     </panel>
-
+                        follows="all"
+                        left="10"
+                        bottom="200"
+                        width="308"
+                        top="35"
+                        bg_opaque_color="InventoryBackgroundColor"
+                        background_visible="true"
+                        background_opaque="true"
+                        tool_tip="Drag and drop items here to prepare them for sale on your storefront"
+                        >
+                        <text
+							name="outbox_inventory_placeholder"
+							type="string"
+							follows="all"
+							layout="topleft"
+							top="0"
+							left="0"
+							width="308"
+							height="165"
+							wrap="true"
+							halign="center">
+							Set up your merchant account to use this feature.
+						</text>
+                    </panel>
                  </panel>
              </layout_panel>
          </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 71f48c833d..2fa7b9f796 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2021,6 +2021,8 @@ Returns a string with the requested data about the region
 	<string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string>
 	<string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
 	<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
+	<string name="InventoryInboxNoItems">Items purchased through the marketplace will be delivered here.</string>
+	<string name="InventoryOutboxNoItems">Drag items here in preparation for listing on your marketplace storefront.</string>
     <!-- use value="" because they have preceding spaces -->
 	<string name="no_transfer" value=" (no transfer)" />
 	<string name="no_modify"   value=" (no modify)" />
-- 
cgit v1.2.3


From 918238dd18f74ee2783d55dfb961e8f44b2f4b1b Mon Sep 17 00:00:00 2001
From: "simon@lindenlab.com" <simon@lindenlab.com>
Date: Fri, 1 Jul 2011 14:06:08 -0700
Subject: ER-1016 - "Remove ability for anyone to edit terrain" and ER-910
 "Parcel Privacy" changes.  Many naming changes for the featureto be "See
 avatars" instead of "hidden avatars".  Also removed the "anyone can edit
 terrain" checkbox and slammed the value to FALSE.

---
 .../textures/icons/Parcel_HiddenAVsOff_Dark.png    | Bin 3011 -> 0 bytes
 .../textures/icons/Parcel_HiddenAVsOn_Dark.png     | Bin 3194 -> 0 bytes
 .../textures/icons/Parcel_HiddenAVsOn_Light.png    | Bin 3189 -> 0 bytes
 .../textures/icons/Parcel_SeeAVsOff_Dark.png       | Bin 0 -> 3194 bytes
 .../textures/icons/Parcel_SeeAVsOff_Light.png      | Bin 0 -> 3189 bytes
 .../textures/icons/Parcel_SeeAVsOn_Dark.png        | Bin 0 -> 3011 bytes
 .../textures/icons/Parcel_SeeAVsOn_Light.png       | Bin 0 -> 3011 bytes
 indra/newview/skins/default/textures/textures.xml  |   7 ++--
 .../skins/default/xui/en/floater_about_land.xml    |  37 ++++++++-------------
 .../newview/skins/default/xui/en/notifications.xml |   4 +--
 .../skins/default/xui/en/panel_place_profile.xml   |  18 +++++-----
 .../skins/default/xui/en/panel_topinfo_bar.xml     |   4 +--
 indra/newview/skins/default/xui/en/strings.xml     |   4 +--
 .../default/xui/en/widgets/location_input.xml      |   6 ++--
 14 files changed, 36 insertions(+), 44 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png

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

diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png
deleted file mode 100644
index 064687ed0f..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png
deleted file mode 100644
index 956e02b14d..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png
deleted file mode 100644
index 434caeda8b..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png
new file mode 100644
index 0000000000..956e02b14d
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png
new file mode 100644
index 0000000000..434caeda8b
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png
new file mode 100644
index 0000000000..064687ed0f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png
new file mode 100644
index 0000000000..5465650d0c
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index e63e25b308..dad6dfd4cf 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -369,9 +369,10 @@ with the same filename but different name
  <texture name="Parcel_ScriptsNo_Dark" file_name="icons/Parcel_ScriptsNo_Dark.png" preload="false" />
  <texture name="Parcel_Voice_Dark" file_name="icons/Parcel_Voice_Dark.png" preload="false" />
  <texture name="Parcel_VoiceNo_Dark" file_name="icons/Parcel_VoiceNo_Dark.png" preload="false" />
- <texture name="Parcel_HiddenAVsOff_Dark" file_name="icons/Parcel_HiddenAVsOff_Dark.png" preload="false" />
- <texture name="Parcel_HiddenAVsOn_Dark" file_name="icons/Parcel_HiddenAVsOn_Dark.png" preload="false" />
- <texture name="Parcel_HiddenAVsOn_Light" file_name="icons/Parcel_HiddenAVsOn_Light.png" preload="false" />
+ <texture name="Parcel_SeeAVsOff_Dark" file_name="icons/Parcel_SeeAVsOff_Dark.png" preload="false" />
+ <texture name="Parcel_SeeAVsOn_Dark" file_name="icons/Parcel_SeeAVsOn_Dark.png" preload="false" />
+ <texture name="Parcel_SeeAVsOff_Light" file_name="icons/Parcel_SeeAVsOff_Light.png" preload="false" />
+ <texture name="Parcel_SeeAVsOn_Light" file_name="icons/Parcel_SeeAVsOn_Light.png" preload="false" />
 
  <texture name="Parcel_BuildNo_Light" file_name="icons/Parcel_BuildNo_Light.png" preload="false" />
  <texture name="Parcel_FlyNo_Light" file_name="icons/Parcel_FlyNo_Light.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 612d2a3bfe..ac186d7737 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1205,8 +1205,8 @@ Only large parcels can be listed in search.
                 No Pushing (Region Override)
             </panel.string>
             <panel.string
-             name="hidden_avs_text">
-                Hidden Avatars
+             name="see_avs_text">
+                See and chat with avatars on this parcel
             </panel.string>
             <text
              type="string"
@@ -1218,18 +1218,9 @@ Only large parcels can be listed in search.
              left="10"
              name="allow_label"
              top="10"
-             width="278">
+             width="270">
                 Allow other Residents to:
             </text>
-            <check_box
-             height="16"
-             label="Edit Terrain"
-             layout="topleft"
-             left="14"
-             name="edit land check"
-             tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land."
-             top_pad="4"
-             width="147i" />
             <check_box
              height="16"
              label="Fly"
@@ -1237,7 +1228,7 @@ Only large parcels can be listed in search.
              name="check fly"
              tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."
              left_pad="4"
-             width="150" />
+             width="128" />
             <text
              type="string"
              length="1"
@@ -1317,7 +1308,16 @@ Only large parcels can be listed in search.
              name="check group scripts"
              top_delta="0"
              width="70" />
-            <text
+          <check_box
+             height="16"
+             label="See Avatars"
+             layout="topleft"
+             left="14"
+             name="SeeAvatarsCheck"
+             tool_tip="Allow avatars on other parcels to see and chat with avatars on this parcel."
+             top_pad="5"
+             width="119" />
+           <text
              type="string"
              text_color="white"
              length="1"
@@ -1355,15 +1355,6 @@ Only large parcels can be listed in search.
              name="ShowDirectoryCheck"
              tool_tip="Let people see this parcel in search results"
              width="280" />
-            <check_box
-             height="16"
-             label="Private Parcel"
-             layout="topleft"
-             left_pad="5"
-             name="PrivateParcelCheck"
-             tool_tip="Prevents avatars from seeing into or out of the parcel."
-             top_delta="0"
-             width="119" />
             <combo_box
              enabled="false"
              height="23"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a6f1b5bf5c..503f8dfe64 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5655,11 +5655,11 @@ This area has building disabled. You can&apos;t build or rez objects here.
 
   <notification
    icon="notify.tga"
-   name="HiddenAVs"
+   name="SeeAvatars"
    persist="true"
    type="notify"
    unique="true">
-This parcel hides avatars from view from another parcel.   You can&apos;t see others outside the parcel, and those outside are not able to see you.
+This parcel hides avatars and text chat from another parcel.   You can&apos;t see other residents outside the parcel, and those outside are not able to see you.  Regular text chat on channel 0 is also blocked.
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 9c6ee32d45..e280115bda 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -154,13 +154,13 @@
      translate="false"
      value="Parcel_DamageNo_Dark" />
     <string
-     name="icon_HiddenAVsOff"
+     name="icon_SeeAVs_Off"
      translate="false"
-     value="Parcel_HiddenAVsOff_Dark" />
+     value="Parcel_SeeAVsOff_Dark" />
     <string
-     name="icon_HiddenAVsOn"
+     name="icon_SeeAVs_On"
      translate="false"
-     value="Parcel_HiddenAVsOn_Dark" />
+     value="Parcel_SeeAVsOn_Dark" />
     <button
      follows="top|left"
      height="24"
@@ -554,10 +554,10 @@
                         <icon
                          follows="top|left"
                          height="18"
-                         image_name="Parcel_HiddenAVsOff_Dark"
+                         image_name="Parcel_SeeAVsOff_Dark"
                          layout="topleft"
                          left="10"
-                         name="hidden_av_icon"
+                         name="see_avatars_icon"
                          top_pad="7"
                          width="22" />
                         <text
@@ -565,15 +565,15 @@
                          height="14"
                          layout="topleft"
                          left_pad="8"
-                         name="hidden_avs_label"
-                         value="Hidden Avatars:"
+                         name="see_avatars_label"
+                         value="See Avatars:"
                          width="90" />
                         <text
                          follows="left|top"
                          height="14"
                          layout="topleft"
                          left_pad="0"
-                         name="hidden_av_value"
+                         name="see_avatars_value"
                          value="Off"
                          width="60" />
                         <button
diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
index d9a0eb884c..79f29777ce 100644
--- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
@@ -91,9 +91,9 @@
   <icon
     follows="right|top"
     height="13"
-    image_name="Parcel_HiddenAVsOn_Light"
+    image_name="Parcel_SeeAVsOff_Light"
     left="2"
-    name="hidden_av_icon"
+    name="see_avatars_icon"
     top="3"
     visible="false"
     width="14"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 416e1ac620..db6cd559b8 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1761,7 +1761,7 @@ Returns the maximum number of prims allowed on the parcel at pos
 	<string name="LSLTipText_llGetParcelDetails" translate="false">
     list llGetParcelDetails(vector pos, list params)
     Returns the parcel details specified in params for the parcel at pos.
-    Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _HIDDEN_AVS
+    Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS
   </string>
 	<string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
 llSetLinkPrimitiveParams(integer linknumber, list rules)
@@ -3133,7 +3133,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlAdultIconTooltip">Adult Region</string>
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
-  <string name="LocationCtrlHiddenAVsTooltip">Hidden Avatars Parcel</string>
+  <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
 
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 6041d750da..44436fb6f2 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -123,13 +123,13 @@
 	font="SansSerifSmall"
 	text_color="TextFgColor"
 	/>
-  <hidden_av_icon
-    name="hidden_av_icon"
+  <see_avatars_icon
+    name="see_avatars_icon"
     width="22"
     height="18"
     top="21"
     follows="right|top"
-    image_name="Parcel_HiddenAVsOn_Light"
+    image_name="Parcel_SeeAVsOff_Light"
     />
   <combo_button
 		name="Location History"
-- 
cgit v1.2.3


From d9d858a7520a7f3627afbe49a19217264f8c4928 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 5 Jul 2011 11:19:54 -0700
Subject: EXP-973 FIX -- Inbox and Outbox panel flash on and off when open
 inventory panel for first time in session on Agni in direct delivery viewer

Layout panels that contain the inbox and outbox are now invisible by default.

Reviewed by Richard.
---
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index baf37ae0b4..79a0ec7c72 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -53,9 +53,10 @@
                  user_resize="false"
                  follows="bottom|left|right"
                  name="inbox_layout_panel"
+                 visible="false"
                  min_dim="35"
                  max_dim="200"
-				 expanded_min_dim="90"
+                 expanded_min_dim="90"
                  height="200">
                  <panel
                       follows="all"
@@ -133,9 +134,10 @@
                 user_resize="false"
                 follows="bottom|left|right"
                 name="outbox_layout_panel"
+                visible="false"
                 min_dim="35"
                 max_dim="200"
-				expanded_min_dim="90"
+                expanded_min_dim="90"
                 height="200">
                  <panel
                       follows="all"
-- 
cgit v1.2.3


From 2f21ec48a222662351c9f8e7243673eb6a31b457 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 5 Jul 2011 12:32:12 -0700
Subject: EXP-860 FIX -- Display NEW for items added to inbox

* Added createFolderView, createFolderViewFolder and createFolderViewItem virtuals
  to LLInventoryPanel so these can be overridden by a derived class for custom display.
* Added new LLInboxInventoryPanel class that overrides createFolderViewFolder with a
  LLInboxFolderViewFolder for custom display with NEW tags.
* LLInboxFolderViewFolder NEW tag is tied to the mFresh variable that currently has
  no logic attached to it, meaning it remains off all the time.

Reviewed by Richard.
---
 indra/newview/skins/default/xui/en/panel_inbox_inventory.xml   |  6 +++---
 .../skins/default/xui/en/widgets/inbox_folder_view_folder.xml  | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
index 49abbcde71..d06190ec54 100644
--- a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<inventory_panel
+<inbox_inventory_panel
     name="inventory_inbox"
-    start_folder="Inbox"
+    start_folder="Received Items"
     follows="all" layout="topleft"
     top="0" left="0" height="165" width="308"
 	top_pad="0"
@@ -14,4 +14,4 @@
     show_item_link_overlays="true"
     >
     <scroll reserve_scroll_corner="false" />
-</inventory_panel>
+</inbox_inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
new file mode 100644
index 0000000000..2c987b158d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_folder_view_folder
+  folder_arrow_image="Folder_Arrow"
+  folder_indentation="8"
+  item_height="20" 
+  item_top_pad="4"
+  selection_image="Rounded_Square"
+  >
+	<new_badge label="New" location="right" location_percent_hcenter="70" />
+</inbox_folder_view_folder>
-- 
cgit v1.2.3


From 31c1cff64fe6e963722e580c8779d69cef4b14ba Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 6 Jul 2011 00:42:28 +0300
Subject: STORM-1262 FIXED Removed the original Windlight Region Settings
 implementation.

---
 .../default/xui/da/floater_day_cycle_options.xml   |   96 --
 .../skins/default/xui/da/floater_env_settings.xml  |   31 -
 .../newview/skins/default/xui/da/floater_water.xml |  103 --
 .../default/xui/da/floater_windlight_options.xml   |  228 ----
 .../default/xui/de/floater_day_cycle_options.xml   |   94 --
 .../skins/default/xui/de/floater_env_settings.xml  |   26 -
 .../newview/skins/default/xui/de/floater_water.xml |   72 --
 .../default/xui/de/floater_windlight_options.xml   |  189 ---
 .../default/xui/en/floater_day_cycle_options.xml   |  416 -------
 .../skins/default/xui/en/floater_env_settings.xml  |  172 ---
 .../newview/skins/default/xui/en/floater_water.xml |  503 --------
 .../default/xui/en/floater_windlight_options.xml   | 1278 --------------------
 .../newview/skins/default/xui/en/notifications.xml |  114 --
 indra/newview/skins/default/xui/en/strings.xml     |    2 -
 .../default/xui/es/floater_day_cycle_options.xml   |   94 --
 .../skins/default/xui/es/floater_env_settings.xml  |   28 -
 .../newview/skins/default/xui/es/floater_water.xml |   88 --
 .../default/xui/es/floater_windlight_options.xml   |  190 ---
 .../default/xui/fr/floater_day_cycle_options.xml   |   94 --
 .../skins/default/xui/fr/floater_env_settings.xml  |   29 -
 .../newview/skins/default/xui/fr/floater_water.xml |   70 --
 .../default/xui/fr/floater_windlight_options.xml   |  189 ---
 .../default/xui/it/floater_day_cycle_options.xml   |   94 --
 .../skins/default/xui/it/floater_env_settings.xml  |   29 -
 .../newview/skins/default/xui/it/floater_water.xml |   95 --
 .../default/xui/it/floater_windlight_options.xml   |  190 ---
 .../default/xui/ja/floater_day_cycle_options.xml   |   94 --
 .../skins/default/xui/ja/floater_env_settings.xml  |   25 -
 .../newview/skins/default/xui/ja/floater_water.xml |   70 --
 .../default/xui/ja/floater_windlight_options.xml   |  189 ---
 .../default/xui/nl/floater_day_cycle_options.xml   |   94 --
 .../skins/default/xui/nl/floater_env_settings.xml  |   24 -
 .../newview/skins/default/xui/nl/floater_water.xml |   89 --
 .../default/xui/nl/floater_windlight_options.xml   |  190 ---
 .../default/xui/pl/floater_day_cycle_options.xml   |   96 --
 .../skins/default/xui/pl/floater_env_settings.xml  |   28 -
 .../newview/skins/default/xui/pl/floater_water.xml |  103 --
 .../default/xui/pl/floater_windlight_options.xml   |  228 ----
 .../default/xui/pt/floater_day_cycle_options.xml   |   67 -
 .../skins/default/xui/pt/floater_env_settings.xml  |   27 -
 .../newview/skins/default/xui/pt/floater_water.xml |   86 --
 .../default/xui/pt/floater_windlight_options.xml   |  187 ---
 .../default/xui/zh/floater_day_cycle_options.xml   |   95 --
 .../skins/default/xui/zh/floater_env_settings.xml  |   25 -
 .../newview/skins/default/xui/zh/floater_water.xml |   70 --
 .../default/xui/zh/floater_windlight_options.xml   |  167 ---
 46 files changed, 6468 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/da/floater_day_cycle_options.xml
 delete mode 100644 indra/newview/skins/default/xui/da/floater_env_settings.xml
 delete mode 100644 indra/newview/skins/default/xui/da/floater_water.xml
 delete mode 100644 indra/newview/skins/default/xui/da/floater_windlight_options.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_env_settings.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_water.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_windlight_options.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_env_settings.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_water.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_windlight_options.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_env_settings.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_water.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_windlight_options.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_env_settings.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_water.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_windlight_options.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_env_settings.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_water.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_windlight_options.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_env_settings.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_water.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_windlight_options.xml
 delete mode 100644 indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml
 delete mode 100644 indra/newview/skins/default/xui/nl/floater_env_settings.xml
 delete mode 100644 indra/newview/skins/default/xui/nl/floater_water.xml
 delete mode 100644 indra/newview/skins/default/xui/nl/floater_windlight_options.xml
 delete mode 100644 indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml
 delete mode 100644 indra/newview/skins/default/xui/pl/floater_env_settings.xml
 delete mode 100644 indra/newview/skins/default/xui/pl/floater_water.xml
 delete mode 100644 indra/newview/skins/default/xui/pl/floater_windlight_options.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_env_settings.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_water.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_windlight_options.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_env_settings.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_water.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_windlight_options.xml

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

diff --git a/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml
deleted file mode 100644
index ffae3d788f..0000000000
--- a/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="DAG CYKLUS OPSÆTNING">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Dag cyklus" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<multi_slider label="" name="WLTimeSlider"/>
-			<multi_slider label="" name="WLDayCycleKeys"/>
-			<text name="WL12am">
-				00:00
-			</text>
-			<text name="WL3am">
-				03:00
-			</text>
-			<text name="WL6am">
-				06:00
-			</text>
-			<text name="WL9amHash">
-				09:00
-			</text>
-			<text name="WL12pmHash">
-				12:00
-			</text>
-			<text name="WL3pm">
-				15:00
-			</text>
-			<text name="WL6pm">
-				18:00
-			</text>
-			<text name="WL9pm">
-				21:00
-			</text>
-			<text name="WL12am2">
-				00:00
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Tilføj key" label_selected="Tilføj key" name="WLAddKey"/>
-			<button label="Slet key" label_selected="Slet key" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Key-frame indstillinger:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Key tid:
-			</text>
-			<spinner label="Timer" name="WLCurKeyHour"/>
-			<spinner label="Min." name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Key fast indstilling:
-			</text>
-			<combo_box label="Faste" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Snap:
-			</text>
-			<combo_box label="5 min" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Cycluslængde:
-			</text>
-			<spinner label="Timer" name="WLLengthOfDayHour"/>
-			<spinner label="Min." name="WLLengthOfDayMin"/>
-			<spinner label="Sek." name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Vis :
-			</text>
-			<button label="Afspil" label_selected="Afspil" name="WLAnimSky"/>
-			<button label="Stop!" label_selected="Stop" name="WLStopAnimSky"/>
-			<button label="Benyt estate tid" label_selected="Gå til estate tid" name="WLUseLindenTime"/>
-			<button label="Gem test-dag" label_selected="Gem test-dag" name="WLSaveDayCycle"/>
-			<button label="Hent test-dag" label_selected="Hent test-dag" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_env_settings.xml b/indra/newview/skins/default/xui/da/floater_env_settings.xml
deleted file mode 100644
index a6fbc05734..0000000000
--- a/indra/newview/skins/default/xui/da/floater_env_settings.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="REDIGERING AF OMGIVELSER">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Tid på 
-dagen
-	</text>
-	<text name="EnvTimeText2">
-		00:00
-	</text>
-	<slider label="" name="EnvTimeSlider"/>
-	<text name="EnvCloudText">
-		Skydække
-	</text>
-	<slider label="" name="EnvCloudSlider"/>
-	<text name="EnvWaterColorText">
-		Farve på 
-vand
-	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Klik for at åbne farvevælger"/>
-	<text name="EnvWaterFogText">
-		Tåge på 
-vand
-	</text>
-	<slider label="" name="EnvWaterFogSlider"/>
-	<button label="Benyt tid fra estate" name="EnvUseEstateTimeButton"/>
-	<button label="Avanceret himmel" name="EnvAdvancedSkyButton"/>
-	<button label="Avanceret vand" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_water.xml b/indra/newview/skins/default/xui/da/floater_water.xml
deleted file mode 100644
index aedd1b442c..0000000000
--- a/indra/newview/skins/default/xui/da/floater_water.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="AVANCERET OPSÆTNING AF VAND">
-	<text name="KeyFramePresetsText">
-		Vand opsætninger:
-	</text>
-	<button label="Ny" label_selected="Ny" name="WaterNewPreset"/>
-	<button label="Gem" label_selected="Gem" name="WaterSavePreset"/>
-	<button label="Slet" label_selected="Slet" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="INDSTILLINGER" name="Settings">
-			<text name="BHText">
-				Vandtåge farve
-			</text>
-			<button label="?" name="WaterFogColorHelp"/>
-			<color_swatch label="" name="WaterFogColor" tool_tip="Klik for at åbne farvevælger"/>
-			<text name="WaterFogDensText">
-				Tåge tæthedskarakteristik
-			</text>
-			<button label="?" name="WaterFogDensityHelp"/>
-			<slider label="" name="WaterFogDensity"/>
-			<text name="WaterUnderWaterFogModText">
-				Tilretning undervandståge
-			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp"/>
-			<slider label="" name="WaterUnderWaterFogMod"/>
-			<text name="BDensText">
-				Lille bølge reflektionsskala
-			</text>
-			<button label="?" name="WaterNormalScaleHelp"/>
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<slider label="" name="WaterNormalScaleX"/>
-			<slider label="" name="WaterNormalScaleY"/>
-			<slider label="" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Spredningsskala
-			</text>
-			<button label="?" name="WaterFresnelScaleHelp"/>
-			<slider label="" name="WaterFresnelScale"/>
-			<text name="FresnelOffsetText">
-				Spredning offset
-			</text>
-			<button label="?" name="WaterFresnelOffsetHelp"/>
-			<slider label="" name="WaterFresnelOffset"/>
-			<text name="DensMultText">
-				Lysbrydning fra oven
-			</text>
-			<button label="?" name="WaterScaleAboveHelp"/>
-			<slider label="" name="WaterScaleAbove"/>
-			<text name="WaterScaleBelowText">
-				Lysbrydning fra neden
-			</text>
-			<button label="?" name="WaterScaleBelowHelp"/>
-			<slider label="" name="WaterScaleBelow"/>
-			<text name="MaxAltText">
-				Udviskning
-			</text>
-			<button label="?" name="WaterBlurMultiplierHelp"/>
-			<slider label="" name="WaterBlurMult"/>
-		</panel>
-		<panel label="BILLEDE" name="Waves">
-			<text name="BHText">
-				Retning for store bølger
-			</text>
-			<button label="?" name="WaterWave1Help"/>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<slider label="" name="WaterWave1DirX"/>
-			<slider label="" name="WaterWave1DirY"/>
-			<text name="BHText2">
-				Retning for små bølger
-			</text>
-			<button label="?" name="WaterWave2Help"/>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<slider label="" name="WaterWave2DirX"/>
-			<slider label="" name="WaterWave2DirY"/>
-			<text name="BHText3">
-				Tekstur map
-			</text>
-			<button label="?" name="WaterNormalMapHelp"/>
-			<texture_picker label="" name="WaterNormalMap"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_windlight_options.xml b/indra/newview/skins/default/xui/da/floater_windlight_options.xml
deleted file mode 100644
index 56f94b24e9..0000000000
--- a/indra/newview/skins/default/xui/da/floater_windlight_options.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="WindLight floater" title="AVANCERET OPSÆTNING FOR HIMMEL">
-	<text name="KeyFramePresetsText">
-		Faste indstillinger:
-	</text>
-	<button label="Ny" label_selected="Ny" name="WLNewPreset" />
-	<button label="Gem" label_selected="Gem" name="WLSavePreset" />
-	<button label="Slet" label_selected="Slet" name="WLDeletePreset" />
-	<button label="Dags cyklus" label_selected="Dags cyklus" name="WLDayCycleMenuButton" />
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSFÆRE" name="Atmosphere">
-			<text name="BHText">
-				Blå - horisont
-			</text>
-			<button label="?" name="WLBlueHorizonHelp" />
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<slider label="" name="WLBlueHorizonR" />
-			<slider label="" name="WLBlueHorizonG" />
-			<slider label="" name="WLBlueHorizonB" />
-			<slider label="" name="WLBlueHorizonI" />
-			<text name="BDensText">
-				Dis - horisont
-			</text>
-			<button label="?" name="WLHazeHorizonHelp" />
-			<slider label="" name="WLHazeHorizon" />
-			<text name="BDensText2">
-				Blå - tæthed
-			</text>
-			<button label="?" name="WLBlueDensityHelp" />
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<slider label="" name="WLBlueDensityR" />
-			<slider label="" name="WLBlueDensityG" />
-			<slider label="" name="WLBlueDensityB" />
-			<slider label="" name="WLBlueDensityI" />
-			<text name="HDText">
-				Dis - intensitet
-			</text>
-			<button label="?" name="WLHazeDensityHelp" />
-			<slider label="" name="WLHazeDensity" />
-			<text name="DensMultText">
-				Densitet faktor
-			</text>
-			<button label="?" name="WLDensityMultHelp" />
-			<slider label="" name="WLDensityMult" />
-			<text name="WLDistanceMultText">
-				Distance faktor
-			</text>
-			<button label="?" name="WLDistanceMultHelp" />
-			<slider label="" name="WLDistanceMult" />
-			<text name="MaxAltText">
-				Maximum højde
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp" />
-			<slider label="" name="WLMaxAltitude" />
-		</panel>
-		<panel label="LYS" name="Lighting">
-			<text name="SLCText">
-				Sol/Måne farve
-			</text>
-			<button label="?" name="WLSunlightColorHelp" />
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<slider label="" name="WLSunlightR" />
-			<slider label="" name="WLSunlightG" />
-			<slider label="" name="WLSunlightB" />
-			<slider label="" name="WLSunlightI" />
-			<text name="TODText">
-				Sol/Måne position
-			</text>
-			<button label="?" name="WLTimeOfDayHelp" />
-			<slider label="" name="WLSunAngle" />
-			<text name="WLAmbientText">
-				Omgivende
-			</text>
-			<button label="?" name="WLAmbientHelp" />
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<slider label="" name="WLAmbientR" />
-			<slider label="" name="WLAmbientG" />
-			<slider label="" name="WLAmbientB" />
-			<slider label="" name="WLAmbientI" />
-			<text name="WLEastAngleText">
-				Øst vinkel
-			</text>
-			<button label="?" name="WLEastAngleHelp" />
-			<slider label="" name="WLEastAngle" />
-			<text name="SunGlowText">
-				Sol glød
-			</text>
-			<button label="?" name="WLSunGlowHelp" />
-			<slider label="Fokus " name="WLGlowB" />
-			<slider label="Størr. " name="WLGlowR" />
-			<text name="SceneGammaText">
-				Lysintensitet (gamma)
-			</text>
-			<button label="?" name="WLSceneGammaHelp" />
-			<slider label="" name="WLGamma" />
-			<text name="WLStarText">
-				Stjerne intensitet
-			</text>
-			<button label="?" name="WLStarBrightnessHelp" />
-			<slider label="" name="WLStarAlpha" />
-		</panel>
-		<panel label="SKYER" name="Clouds">
-			<text name="WLCloudColorText">
-				Farve på skyer
-			</text>
-			<button label="?" name="WLCloudColorHelp" />
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<slider label="" name="WLCloudColorR" />
-			<slider label="" name="WLCloudColorG" />
-			<slider label="" name="WLCloudColorB" />
-			<slider label="" name="WLCloudColorI" />
-			<text name="WLCloudColorText2">
-				Skyer XY/Tæthed
-			</text>
-			<button label="?" name="WLCloudDensityHelp" />
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				T
-			</text>
-			<slider label="" name="WLCloudX" />
-			<slider label="" name="WLCloudY" />
-			<slider label="" name="WLCloudDensity" />
-			<text name="WLCloudCoverageText">
-				Skydække
-			</text>
-			<button label="?" name="WLCloudCoverageHelp" />
-			<slider label="" name="WLCloudCoverage" />
-			<text name="WLCloudScaleText">
-				Skystørrelse
-			</text>
-			<button label="?" name="WLCloudScaleHelp" />
-			<slider label="" name="WLCloudScale" />
-			<text name="WLCloudDetailText">
-				Sky detaljer(XY/tæthed)
-			</text>
-			<button label="?" name="WLCloudDetailHelp" />
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				T
-			</text>
-			<slider label="" name="WLCloudDetailX" />
-			<slider label="" name="WLCloudDetailY" />
-			<slider label="" name="WLCloudDetailDensity" />
-			<text name="WLCloudScrollXText">
-				Sky drift X
-			</text>
-			<button label="?" name="WLCloudScrollXHelp" />
-			<check_box label="Lås" name="WLCloudLockX" />
-			<slider label="" name="WLCloudScrollX" />
-			<text name="WLCloudScrollYText">
-				Sky drift Y
-			</text>
-			<button label="?" name="WLCloudScrollYHelp" />
-			<check_box label="Lås" name="WLCloudLockY" />
-			<slider label="" name="WLCloudScrollY" />
-			<check_box label="Benyt simple skyer" name="DrawClassicClouds" />
-			<button label="?" name="WLClassicCloudsHelp" />
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
deleted file mode 100644
index 8599737106..0000000000
--- a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="TAGESZYKLUS-EDITOR">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Tageszyklus" name="Day Cycle">
-			<button label=" ?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				24:00
-			</text>
-			<text name="WL3am">
-				03:00
-			</text>
-			<text name="WL6am">
-				06:00
-			</text>
-			<text name="WL9amHash">
-				09:00
-			</text>
-			<text name="WL12pmHash">
-				12:00
-			</text>
-			<text name="WL3pm">
-				15:00
-			</text>
-			<text name="WL6pm">
-				18:00
-			</text>
-			<text name="WL9pm">
-				21:00
-			</text>
-			<text name="WL12am2">
-				24:00
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Key hinzu" label_selected="Key hinzu" name="WLAddKey"/>
-			<button label="Key löschen" label_selected="Key löschen" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Keyframe-Einstellungen:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Key-Zeit:
-			</text>
-			<spinner label="Std." name="WLCurKeyHour"/>
-			<spinner label="Min." name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Key-Voreinstellung:
-			</text>
-			<combo_box label="Voreinstellung" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Einrasten:
-			</text>
-			<combo_box label="5 min" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Zykluslänge:
-			</text>
-			<spinner label="Std." name="WLLengthOfDayHour"/>
-			<spinner label="Min." name="WLLengthOfDayMin"/>
-			<spinner label="Sek." name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Vorschau:
-			</text>
-			<button label="Start" label_selected="Start" name="WLAnimSky"/>
-			<button label="Stopp" label_selected="Stopp" name="WLStopAnimSky"/>
-			<button label="Grundbesitzzeit verw" label_selected="Zur Grundbesitzzeit" name="WLUseLindenTime"/>
-			<button label="Testtag speichern" label_selected="Testtag speichern" name="WLSaveDayCycle"/>
-			<button label="Testtag laden" label_selected="Testtag laden" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_env_settings.xml b/indra/newview/skins/default/xui/de/floater_env_settings.xml
deleted file mode 100644
index 0c78909108..0000000000
--- a/indra/newview/skins/default/xui/de/floater_env_settings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="UMWELT-EDITOR">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Tageszeit
-	</text>
-	<text name="EnvTimeText2">
-		12:00
-	</text>
-	<text name="EnvCloudText">
-		Wolkendecke
-	</text>
-	<text name="EnvWaterColorText">
-		Wasserfarbe
-	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
-	<text name="EnvWaterFogText">
-		Wasser-
-trübung
-	</text>
-	<button label="Grundbesitzzeit verw." name="EnvUseEstateTimeButton"/>
-	<button label="Himmel (erweitert)" name="EnvAdvancedSkyButton"/>
-	<button label="Wasser (erweitert)" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml
deleted file mode 100644
index bb0dd9c75d..0000000000
--- a/indra/newview/skins/default/xui/de/floater_water.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="ERWEITERTER WASSER-EDITOR">
-	<floater.string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</floater.string>
-	<text name="KeyFramePresetsText" width="110">
-		Voreinstellungen:
-	</text>
-	<combo_box left_delta="110" name="WaterPresetsCombo"/>
-	<button label="Neu" label_selected="Neu" name="WaterNewPreset"/>
-	<button label="Speichern" label_selected="Speichern" name="WaterSavePreset"/>
-	<button label="Löschen" label_selected="Löschen" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="EINSTELLUNGEN" name="Settings">
-			<text name="BHText">
-				Wassertrübungsfarbe
-			</text>
-			<color_swatch name="WaterFogColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
-			<text name="WaterFogDensText">
-				Wassertrübungsdichte
-			</text>
-			<text name="WaterUnderWaterFogModText">
-				Wassertrübungs-Modifikator
-			</text>
-			<slider bottom_delta="-34" name="WaterUnderWaterFogMod"/>
-			<text name="BDensText">
-				Reflexionswellengröße
-			</text>
-			<slider label="1" name="WaterNormalScaleX"/>
-			<slider label="2" name="WaterNormalScaleY"/>
-			<slider label="3" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Fresnel-Skalierung
-			</text>
-			<text name="FresnelOffsetText">
-				Fresnel-Versatz
-			</text>
-			<text name="DensMultText">
-				Brechungsstärke oben
-			</text>
-			<text name="WaterScaleBelowText">
-				Brechungsstärke unten
-			</text>
-			<text name="MaxAltText">
-				Mischungsmultiplikator
-			</text>
-		</panel>
-		<panel label="BILD" name="Waves">
-			<text name="BHText">
-				Richtung große Welle
-			</text>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Richtung kleine Welle
-			</text>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Normal-Map
-			</text>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_windlight_options.xml b/indra/newview/skins/default/xui/de/floater_windlight_options.xml
deleted file mode 100644
index 5b59336f9d..0000000000
--- a/indra/newview/skins/default/xui/de/floater_windlight_options.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="ERWEITERTER HIMMEL-EDITOR">
-	<text name="KeyFramePresetsText">
-		Voreinstellungen:
-	</text>
-	<button label="Neu" label_selected="Neu" name="WLNewPreset"/>
-	<button label="Speichern" label_selected="Speichern" name="WLSavePreset"/>
-	<button label="Löschen" label_selected="Löschen" name="WLDeletePreset"/>
-	<button label="Tageszyklus-Editor" label_selected="Tageszyklus-Editor" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSPHÄRE" name="Atmosphere">
-			<text name="BHText">
-				Horizontfarbe
-			</text>
-			<button label=" ?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Horizonttrübung
-			</text>
-			<button label=" ?" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				Farbintensität
-			</text>
-			<button label=" ?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Trübungsintensität
-			</text>
-			<button label=" ?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				Dichtemultiplikator
-			</text>
-			<button label=" ?" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				Entfernungsmultiplikator
-			</text>
-			<button label=" ?" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				Max. Höhe
-			</text>
-			<button label=" ?" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="LICHT" name="Lighting">
-			<text name="SLCText">
-				Sonne/Mond-Farbe
-			</text>
-			<button label=" ?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Sonne/Mond-Stand
-			</text>
-			<button label=" ?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				Umgebung
-			</text>
-			<button label=" ?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Ostausrichtung
-			</text>
-			<button label=" ?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				Sonnenleuchtkraft
-			</text>
-			<button label=" ?" name="WLSunGlowHelp"/>
-			<slider label="Fokus " name="WLGlowB"/>
-			<slider label="Größe    " name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Gamma in Szene
-			</text>
-			<button label=" ?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				Sternenleuchtkraft
-			</text>
-			<button label=" ?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="WOLKEN" name="Clouds">
-			<text name="WLCloudColorText">
-				Wolkenfarbe
-			</text>
-			<button label=" ?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Wolken-XY/Dichte
-			</text>
-			<button label=" ?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Wolkendichte
-			</text>
-			<button label=" ?" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				Wolkenskalierung
-			</text>
-			<button label=" ?" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				Wolkendetails (XY/Dichte)
-			</text>
-			<button label=" ?" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Wolkenbewegung X
-			</text>
-			<button label=" ?" name="WLCloudScrollXHelp"/>
-			<check_box label="Fest" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Wolkenbewegung Y
-			</text>
-			<button label=" ?" name="WLCloudScrollYHelp"/>
-			<check_box label="Fest" name="WLCloudLockY"/>
-			<check_box label="Klassische Wolken" name="DrawClassicClouds"/>
-			<button label=" ?" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
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
@@ -4852,18 +4852,6 @@ Do you wish to overwrite the saved preset?
      yestext="Yes"/>
   </notification>
 
-  <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"
@@ -4887,40 +4875,6 @@ This day cycle file references a missing sky file: [SKY].
 Sorry, the settings couldn't be applied to the region.  Leaving the region and then returning may help rectify the problem.  The reason given was: [FAIL_REASON]
   </notification>
 
-  <notification
-   functor="GenericAcknowledge"
-   icon="alertmodal.tga"
-   name="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"
@@ -4965,74 +4919,6 @@ PostProcess Effect exists. Do you still wish overwrite it?
      yestext="Yes"/>
   </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"
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>
diff --git a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
deleted file mode 100644
index 9c3ac1be0e..0000000000
--- a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="EDITOR DEL CICLO DE UN DÍA">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Ciclo de un día" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				12 am
-			</text>
-			<text name="WL3am">
-				3 am
-			</text>
-			<text name="WL6am">
-				6 am
-			</text>
-			<text name="WL9amHash">
-				9 am
-			</text>
-			<text name="WL12pmHash">
-				12 pm
-			</text>
-			<text name="WL3pm">
-				3 pm
-			</text>
-			<text name="WL6pm">
-				6 pm
-			</text>
-			<text name="WL9pm">
-				9 pm
-			</text>
-			<text name="WL12am2">
-				12 am
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Añadir un punto" label_selected="Añadir un punto" name="WLAddKey"/>
-			<button label="Quitar un punto" label_selected="Quitar un punto" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Configuración del fotograma clave:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Hora clave:
-			</text>
-			<spinner label="Hora" name="WLCurKeyHour"/>
-			<spinner label="Min." name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Modelo predefinido:
-			</text>
-			<combo_box label="Predefinido" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Intervalo:
-			</text>
-			<combo_box label="5 min." name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Duración del ciclo:
-			</text>
-			<spinner label="Hora" name="WLLengthOfDayHour"/>
-			<spinner label="Min." name="WLLengthOfDayMin"/>
-			<spinner label="Seg." name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Vista previa:
-			</text>
-			<button label="Probar" label_selected="Probar" name="WLAnimSky"/>
-			<button label="Parar" label_selected="Parar" name="WLStopAnimSky"/>
-			<button label="Usar el horario del estado" label_selected="Ir al horario del estado" name="WLUseLindenTime"/>
-			<button label="Guardar este tipo de día" label_selected="Guardar este tipo de día" name="WLSaveDayCycle"/>
-			<button label="Cargar y probar un tipo de día" label_selected="Cargar y probar un tipo de día" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_env_settings.xml b/indra/newview/skins/default/xui/es/floater_env_settings.xml
deleted file mode 100644
index 195690f546..0000000000
--- a/indra/newview/skins/default/xui/es/floater_env_settings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="EDITOR DEL ENTORNO">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Duración de
-un día
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<text name="EnvCloudText">
-		Nubosidad
-	</text>
-	<text name="EnvWaterColorText">
-		Color del
-agua
-	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Pulsa para abrir el selector de color"/>
-	<text name="EnvWaterFogText">
-		Claridad del
-agua
-	</text>
-	<button bottom="-144" label="Usar el horario del estado" name="EnvUseEstateTimeButton" width="155"/>
-	<button label="Cielo avanzado" left="167" name="EnvAdvancedSkyButton" width="155"/>
-	<button label="Agua avanzada" left="326" name="EnvAdvancedWaterButton" width="155"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_water.xml b/indra/newview/skins/default/xui/es/floater_water.xml
deleted file mode 100644
index 2c1f6cfbfb..0000000000
--- a/indra/newview/skins/default/xui/es/floater_water.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="EDITOR AVANZADO DEL AGUA">
-	<text name="KeyFramePresetsText">
-		Agua predefinida:
-	</text>
-	<button label="Nueva" label_selected="Nueva" name="WaterNewPreset"/>
-	<button label="Guardar" label_selected="Guardar" name="WaterSavePreset"/>
-	<button label="Borrar" label_selected="Borrar" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="CONFIGURACIÓN" name="Settings">
-			<text name="BHText">
-				Color del agua
-			</text>
-			<button label="?" left="175" name="WaterFogColorHelp"/>
-			<color_swatch label="" name="WaterFogColor" tool_tip="Pulsa para abrir el selector de color"/>
-			<text name="WaterFogDensText">
-				Transparencia
-			</text>
-			<button label="?" left="175" name="WaterFogDensityHelp"/>
-			<text name="WaterUnderWaterFogModText">
-				Modificar la claridad del agua
-			</text>
-			<button label="?" left="175" name="WaterUnderWaterFogModHelp"/>
-			<text name="BDensText">
-				Tamaño de las ondulaciones
-			</text>
-			<button label="?" left="405" name="WaterNormalScaleHelp"/>
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<text name="HDText">
-				Escala de Fresnel
-			</text>
-			<button label="?" left="405" name="WaterFresnelScaleHelp"/>
-			<text name="FresnelOffsetText">
-				Coeficiente de reflexión
-			</text>
-			<button label="?" left="405" name="WaterFresnelOffsetHelp"/>
-			<text name="DensMultText">
-				Refracción de la superficie
-			</text>
-			<button label="?" left="640" name="WaterScaleAboveHelp"/>
-			<text name="WaterScaleBelowText">
-				Refracción bajo la superficie
-			</text>
-			<button label="?" left="640" name="WaterScaleBelowHelp"/>
-			<text name="MaxAltText">
-				Desenfoque
-			</text>
-			<button label="?" left="640" name="WaterBlurMultiplierHelp"/>
-		</panel>
-		<panel label="IMAGEN" name="Waves">
-			<text name="BHText">
-				Sentido de la onda grande
-			</text>
-			<button label="?" left="170" name="WaterWave1Help"/>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Sentido de la onda pequeña
-			</text>
-			<button label="?" left="170" name="WaterWave2Help"/>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Vista Normal
-			</text>
-			<button label="?" name="WaterNormalMapHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_windlight_options.xml b/indra/newview/skins/default/xui/es/floater_windlight_options.xml
deleted file mode 100644
index 585a42e429..0000000000
--- a/indra/newview/skins/default/xui/es/floater_windlight_options.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="EDITOR AVANZADO DEL CIELO">
-	<text name="KeyFramePresetsText">
-		Cielos definidos:
-	</text>
-	<button label="Nuevo" label_selected="Nuevo" name="WLNewPreset"/>
-	<button label="Guardar" label_selected="Guardar" name="WLSavePreset"/>
-	<button label="Borrar" label_selected="Borrar" name="WLDeletePreset"/>
-	<button font="SansSerifSmall" label="Editor del ciclo de un día" label_selected="Editor del ciclo de un día" left_delta="90" name="WLDayCycleMenuButton" width="150"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMÓSFERA" name="Atmosphere">
-			<text name="BHText">
-				Coloración
-			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				V
-			</text>
-			<text name="BHText4">
-				A
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Cantidad de bruma
-			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				Saturación
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				V
-			</text>
-			<text name="BHText8">
-				A
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Densidad de la bruma
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				Densidad
-			</text>
-			<button label="?" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				Distancia
-			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				Altitud máx.
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="LUZ" name="Lighting">
-			<text name="SLCText">
-				Color del Sol y de la Luna
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				V
-			</text>
-			<text name="BHText3">
-				A
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Posición del Sol y la Luna
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				Ambiental
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				V
-			</text>
-			<text name="BHText7">
-				A
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Ángulo de elevación
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				Resplandor del Sol
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="Visión" name="WLGlowB"/>
-			<slider label="Tamaño" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Gamma de la escena
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				Brillo de las estrellas
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="NUBES" name="Clouds">
-			<text name="WLCloudColorText">
-				Color de las nubes
-			</text>
-			<button label="?" left="190" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				V
-			</text>
-			<text name="BHText3">
-				A
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Posición/Densidad de las nubes
-			</text>
-			<button label="?" left="190" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Nubosidad
-			</text>
-			<button label="?" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				Altitud de las nubes
-			</text>
-			<button label="?" name="WLCloudScaleHelp"/>
-			<text font="SansSerifSmall" name="WLCloudDetailText">
-				Detalle de las nubes (Posición/Densidad)
-			</text>
-			<button label="?" name="WLCloudDetailHelp"/>
-			<text bottom="-113" name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<slider bottom="-127" name="WLCloudDetailX"/>
-			<text name="WLCloudScrollXText">
-				Velocidad de X
-			</text>
-			<button label="?" name="WLCloudScrollXHelp"/>
-			<check_box label="Bloquear" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Velocidad de Y
-			</text>
-			<button label="?" name="WLCloudScrollYHelp"/>
-			<check_box label="Bloquear" name="WLCloudLockY"/>
-			<check_box label="Incluir nubes clásicas" name="DrawClassicClouds"/>
-			<button label="?" left="618" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
deleted file mode 100644
index 0ce17b9dc6..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="EDITEUR DU CYCLE DU JOUR">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Cycle du jour" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				Min.
-			</text>
-			<text name="WL3am">
-				3h
-			</text>
-			<text name="WL6am">
-				6h
-			</text>
-			<text name="WL9amHash">
-				9h
-			</text>
-			<text name="WL12pmHash">
-				Midi
-			</text>
-			<text name="WL3pm">
-				15h
-			</text>
-			<text name="WL6pm">
-				18h
-			</text>
-			<text name="WL9pm">
-				21h
-			</text>
-			<text name="WL12am2">
-				Min.
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey"/>
-			<button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Réglages des images-clés :
-			</text>
-			<text name="WLCurKeyTimeText">
-				Heure de la clé :
-			</text>
-			<spinner label="Heure" name="WLCurKeyHour"/>
-			<spinner label="Min" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Préréglages clés :
-			</text>
-			<combo_box label="Préréglage" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Snap :
-			</text>
-			<combo_box label="5 min" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Durée du cycle :
-			</text>
-			<spinner label="Heure" name="WLLengthOfDayHour"/>
-			<spinner label="Min" name="WLLengthOfDayMin"/>
-			<spinner label="Sec" name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Aperçu :
-			</text>
-			<button label="Lire" label_selected="Lire" name="WLAnimSky"/>
-			<button label="Arrêter" label_selected="Stop" name="WLStopAnimSky"/>
-			<button label="Utiliser heure domaine" label_selected="Aller heure domaine" name="WLUseLindenTime"/>
-			<button label="Enregistrer jour test" label_selected="Enregistrer jour test" name="WLSaveDayCycle"/>
-			<button label="Charger jour test" label_selected="Charger jour test" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_env_settings.xml b/indra/newview/skins/default/xui/fr/floater_env_settings.xml
deleted file mode 100644
index dd714e85b6..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_env_settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="ÉDITEUR D&apos;ENVIRONNEMENT">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text bottom="-45" name="EnvTimeText" top="29">
-		Heure de la
-journée
-	</text>
-	<text bottom_delta="-36" name="EnvTimeText2">
-		Midi
-	</text>
-	<text name="EnvCloudText">
-		Couverture
-nuageuse
-	</text>
-	<text bottom="-45" name="EnvWaterColorText" top="29">
-		Couleur de
-l&apos;eau
-	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
-	<text name="EnvWaterFogText">
-		Brouillard
-dans l&apos;eau
-	</text>
-	<button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="152"/>
-	<button label="Ciel avancé" left="162" name="EnvAdvancedSkyButton" width="145"/>
-	<button label="Eau avancée" left="316" name="EnvAdvancedWaterButton" width="145"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml
deleted file mode 100644
index 7d1e3cd65c..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_water.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="ÉDITEUR D&apos;EAU AVANCÉ">
-	<floater.string name="WLDefaultWaterNames">
-		Valeur par défaut:Transparente:Bassin:Trouble:Première plaie:SERPENT !!!:Valdez
-	</floater.string>
-	<text name="KeyFramePresetsText" width="120">
-		Préréglages :
-	</text>
-	<button label="Nouveau" label_selected="Nouveau" name="WaterNewPreset"/>
-	<button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WaterSavePreset" width="75"/>
-	<button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="PARAMÈTRES" name="Settings">
-			<text name="BHText">
-				Couleur du brouillard dans l&apos;eau
-			</text>
-			<color_swatch left="75" name="WaterFogColor" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
-			<text name="WaterFogDensText">
-				Densité du brouillard
-			</text>
-			<text name="WaterUnderWaterFogModText">
-				Brouillard sous-marin
-			</text>
-			<text name="BDensText">
-				Échelle des vaguelettes
-			</text>
-			<slider label="1" name="WaterNormalScaleX"/>
-			<slider label="2" name="WaterNormalScaleY"/>
-			<slider label="3" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Échelle Fresnel
-			</text>
-			<text name="FresnelOffsetText">
-				Décalage Fresnel
-			</text>
-			<text name="DensMultText">
-				Réfraction au-dessus
-			</text>
-			<text name="WaterScaleBelowText">
-				Réfraction en dessous
-			</text>
-			<text name="MaxAltText">
-				Multiplicateur de flou
-			</text>
-		</panel>
-		<panel label="IMAGE" name="Waves">
-			<text name="BHText">
-				Direction grande vague
-			</text>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Direction petite vague
-			</text>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Normal Map
-			</text>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
deleted file mode 100644
index 657e5f5051..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="ÉDITEUR DE CIEL AVANCÉ" width="706">
-	<text name="KeyFramePresetsText">
-		Préréglages :
-	</text>
-	<button label="Nouveau" label_selected="Nouveau" name="WLNewPreset"/>
-	<button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WLSavePreset" width="75"/>
-	<button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WLDeletePreset"/>
-	<button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_delta="95" left_pad="20" name="WLDayCycleMenuButton" width="150"/>
-	<tab_container name="WindLight Tabs" width="706">
-		<panel label="ATMOSPHÈRE" name="Atmosphere">
-			<text name="BHText">
-				Bleu de l&apos;horizon
-			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				V
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Quantité de brume
-			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				Densité du bleu
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				V
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Densité de la brume
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				Multiplicateur de densité
-			</text>
-			<button label="?" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				Multiplicateur de distance
-			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				Altitude maximum
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="LUMIÈRE" name="Lighting">
-			<text name="SLCText">
-				Couleur soleil/lune
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				V
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Position soleil/lune
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				Éclairage ambiant
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				V
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Angle du levant
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				Rayonnement du soleil
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="Netteté " name="WLGlowB"/>
-			<slider label="Taille    " name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Gamma de la scène
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				Éclat des étoiles
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="NUAGES" name="Clouds">
-			<text name="WLCloudColorText">
-				Couleur des nuages
-			</text>
-			<button label="?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				V
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Nuages XY/densité
-			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Couverture nuageuse
-			</text>
-			<button label="?" left="407" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				Altitude des nuages
-			</text>
-			<button label="?" left="407" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				Détails nuages (XY/densité)
-			</text>
-			<button bottom_delta="-2" label="?" left="407" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Direction et vitesse X
-			</text>
-			<button label="?" name="WLCloudScrollXHelp"/>
-			<check_box label="Verrouiller" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Direction et vitesse Y
-			</text>
-			<button label="?" name="WLCloudScrollYHelp"/>
-			<check_box label="Verrouiller" name="WLCloudLockY"/>
-			<check_box label="Nuages classiques" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-Minuit:A-Midi:A-3h:A-15h:A-16h30:A-6h:A-18h:A-9h:A-21h:Barcelone:Blizzard:Bleu mi-journée:Après-midi sur la côte:Coucher de soleil (côte):Valeur par défaut:Coucher de soleil (désert):Belle journée:Gros nuages floconneux:Brumeux:Funky Funky:Funky Funky Funky:Gelatto:Fantôme:Vérités incohérentes:Mi-journée 1:Mi-journée 2:Mi-journée 3:Mi-journée 4:Nuit:Pirate:Mauve:Rêve de navigateur:Sensualité pure
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
deleted file mode 100644
index 98c385d29f..0000000000
--- a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="EDITOR DELLE CICLO GIORNO/NOTTE">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Ciclo giorno/notte" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				0:00
-			</text>
-			<text name="WL3am">
-				3:00
-			</text>
-			<text name="WL6am">
-				6:00
-			</text>
-			<text name="WL9amHash">
-				9:00
-			</text>
-			<text name="WL12pmHash">
-				12:00
-			</text>
-			<text name="WL3pm">
-				15:00
-			</text>
-			<text name="WL6pm">
-				18:00
-			</text>
-			<text name="WL9pm">
-				21:00
-			</text>
-			<text name="WL12am2">
-				24:00
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Aggiungi voce" label_selected="Aggiungi voce" name="WLAddKey"/>
-			<button label_selected="Cancella voce" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Impostazioni del fotogramma chiave:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Tempo:
-			</text>
-			<spinner label="Ora" name="WLCurKeyHour"/>
-			<spinner label="Min" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Impostazione chiave:
-			</text>
-			<combo_box label="Programma:" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Raggruppa:
-			</text>
-			<combo_box label="5 min" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Lunghezza del ciclo:
-			</text>
-			<spinner label="Ore" name="WLLengthOfDayHour"/>
-			<spinner label="Min" name="WLLengthOfDayMin"/>
-			<spinner label="Sec" name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Anteprima:
-			</text>
-			<button label="Avvia" label_selected="Avvia" name="WLAnimSky"/>
-			<button label="Arresta!" label_selected="Arresta" name="WLStopAnimSky"/>
-			<button label="Usa l&apos;ora della proprietà" label_selected="Vai all&apos;ora della proprietà" name="WLUseLindenTime"/>
-			<button label="Salva il test del giorno" label_selected="Salva il test del giorno" name="WLSaveDayCycle"/>
-			<button label="Carica il test del giorno" label_selected="Carica il test del giorno" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_env_settings.xml b/indra/newview/skins/default/xui/it/floater_env_settings.xml
deleted file mode 100644
index 1c17c18e84..0000000000
--- a/indra/newview/skins/default/xui/it/floater_env_settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="EDITOR DELL&apos;AMBIENTE">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Ora del
-giorno
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<text name="EnvCloudText">
-		Intensità delle
-Nuvole
-	</text>
-	<text name="EnvWaterColorText">
-		Colore
-dell&apos;Acqua
-	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Clicca per aprire il selettore dei colori"/>
-	<text name="EnvWaterFogText">
-		Nebbiosità
-dell&apos;acqua
-	</text>
-	<button bottom="-144" label="Usa orario della regione" name="EnvUseEstateTimeButton" width="145"/>
-	<button label="Cielo avanzato" name="EnvAdvancedSkyButton"/>
-	<button label="Acqua avanzata" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_water.xml b/indra/newview/skins/default/xui/it/floater_water.xml
deleted file mode 100644
index b25f0a6266..0000000000
--- a/indra/newview/skins/default/xui/it/floater_water.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="EDITOR AVANZATO DELL&apos;ACQUA">
-	<text name="KeyFramePresetsText" width="245">
-		Impostazioni predeterminate dell&apos;acqua:
-	</text>
-	<combo_box left_delta="245" name="WaterPresetsCombo" width="150"/>
-	<button label="Nuovo" label_selected="Nuovo" name="WaterNewPreset"/>
-	<button label="Salva" label_selected="Salva" name="WaterSavePreset"/>
-	<button label="Cancella" label_selected="Cancella" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="IMPOSTAZIONI" name="Settings">
-			<text name="BHText">
-				Colore della nebbiosità dell&apos;acqua
-			</text>
-			<button label="?" left="209" name="WaterFogColorHelp"/>
-			<color_swatch label="" name="WaterFogColor" tool_tip="Clicca per aprire il selettore dei colori"/>
-			<text font="SansSerifSmall" name="WaterFogDensText">
-				Esponente di densità della nebbia
- dell&apos;acqua
-			</text>
-			<slider bottom_delta="-40" name="WaterFogDensity"/>
-			<button label="?" left="209" name="WaterFogDensityHelp"/>
-			<text bottom="-140" font="SansSerifSmall" name="WaterUnderWaterFogModText">
-				Regolatore effetto nebbia subacquea
-			</text>
-			<button label="?" left="209" name="WaterUnderWaterFogModHelp"/>
-			<text name="BDensText">
-				Scala di riflessione delle onde
-			</text>
-			<button label="?" left="415" name="WaterNormalScaleHelp"/>
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<text name="HDText">
-				Scala Fresnel
-			</text>
-			<button label="?" left="415" name="WaterFresnelScaleHelp"/>
-			<text name="FresnelOffsetText">
-				Offset Fresnel
-			</text>
-			<button label="?" left="415" name="WaterFresnelOffsetHelp"/>
-			<text font="SansSerifSmall" name="DensMultText">
-				Scala di rifrazione nell&apos;acqua
- dall&apos;alto
-			</text>
-			<slider bottom_delta="-40" name="WaterScaleAbove"/>
-			<button label="?" left="650" name="WaterScaleAboveHelp"/>
-			<text bottom="-70" font="SansSerifSmall" name="WaterScaleBelowText">
-				Scala di rifrazione nell&apos;acqua
- dal basso
-			</text>
-			<slider bottom_delta="-40" name="WaterScaleBelow"/>
-			<button label="?" left="650" name="WaterScaleBelowHelp"/>
-			<text bottom="-122" name="MaxAltText">
-				Moltiplicatore della sfocatura
-			</text>
-			<button label="?" left="650" name="WaterBlurMultiplierHelp"/>
-		</panel>
-		<panel label="IMMAGINE" name="Waves">
-			<text name="BHText">
-				Direzione della grande onda
-			</text>
-			<button label="?" left="170" name="WaterWave1Help"/>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Direzione della piccola onda
-			</text>
-			<button label="?" left="170" name="WaterWave2Help"/>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Mappatura normale
-			</text>
-			<button label="?" name="WaterNormalMapHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_windlight_options.xml b/indra/newview/skins/default/xui/it/floater_windlight_options.xml
deleted file mode 100644
index 6828d05be0..0000000000
--- a/indra/newview/skins/default/xui/it/floater_windlight_options.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="EDITOR AVANZATO DEL CIELO">
-	<text name="KeyFramePresetsText" width="105">
-		Cieli predefiniti:
-	</text>
-	<combo_box left_delta="105" name="WLPresetsCombo"/>
-	<button label="Nuovo" label_selected="Nuovo" name="WLNewPreset"/>
-	<button label="Salva" label_selected="Salva" left_delta="72" name="WLSavePreset"/>
-	<button label="Elimina" label_selected="Elimina" left_delta="72" name="WLDeletePreset"/>
-	<button font="SansSerifSmall" label="Editor del ciclo giorno/notte" label_selected="Editor del ciclo giorno/notte" left_delta="85" name="WLDayCycleMenuButton" width="165"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSFERA" name="Atmosphere">
-			<text name="BHText">
-				Blu dell&apos;Orizzonte
-			</text>
-			<button label="?" left="189" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text font="SansSerifSmall" name="BDensText">
-				Altezza della Foschia all&apos;Orizzonte
-			</text>
-			<button label="?" left="189" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				Densità del Blu
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Densità  della Foschia
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				Moltiplicatore di Densità
-			</text>
-			<button label="?" left="645" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				Moltiplicatore della Distanza
-			</text>
-			<button label="?" left="645" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				Altitudine Massima
-			</text>
-			<button label="?" left="645" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="ILLUMINAZIONE" name="Lighting">
-			<text name="SLCText">
-				Colore Sole/Luna
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Posizione Sole/Luna
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				Ambiente
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Angolo Est
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				Corona intorno al sole
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="Focus" name="WLGlowB"/>
-			<slider label="Grandezza" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Gamma della Scena
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				Luminosità  delle stelle
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="NUVOLE" name="Clouds">
-			<text name="WLCloudColorText">
-				Colore delle Nuvole
-			</text>
-			<button label="?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Nuvole XY/Densità
-			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Copertura delle Nuvole
-			</text>
-			<button label="?" left="415" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				Altitudine delle Nuvole
-			</text>
-			<button label="?" left="415" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				Dettagli Nuvole (XY/ Densità)
-			</text>
-			<button label="?" left="415" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Scorrimento delle X
-			</text>
-			<button label="?" name="WLCloudScrollXHelp"/>
-			<check_box label="Blocca" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Scorrimento delle Y
-			</text>
-			<button label="?" name="WLCloudScrollYHelp"/>
-			<check_box label="Blocca" name="WLCloudLockY"/>
-			<check_box label="Mostra le Nuvole Classiche" name="DrawClassicClouds"/>
-			<button label="?" left="645" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
deleted file mode 100644
index b0949cd4e0..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="デイサイクル編集">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="デイサイクル" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				深夜 12時
-			</text>
-			<text name="WL3am">
-				午前 3時
-			</text>
-			<text name="WL6am">
-				午前 6時
-			</text>
-			<text name="WL9amHash">
-				午前 9時
-			</text>
-			<text name="WL12pmHash">
-				正午 12時
-			</text>
-			<text name="WL3pm">
-				午後 3時
-			</text>
-			<text name="WL6pm">
-				午後 6時
-			</text>
-			<text name="WL9pm">
-				午後 9時
-			</text>
-			<text name="WL12am2">
-				深夜 12時
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="キーの追加" label_selected="キーの追加" name="WLAddKey"/>
-			<button label="キーの削除" label_selected="キーの削除" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				キーフレームの設定：
-			</text>
-			<text name="WLCurKeyTimeText">
-				キータイム：
-			</text>
-			<spinner label="時間" name="WLCurKeyHour"/>
-			<spinner label="分" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				キーの事前設定：
-			</text>
-			<combo_box label="事前設定" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				スナップ：
-			</text>
-			<combo_box label="5 分" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				サイクルの長さ：
-			</text>
-			<spinner label="時間" name="WLLengthOfDayHour"/>
-			<spinner label="分" name="WLLengthOfDayMin"/>
-			<spinner label="秒" name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				プレビュー：
-			</text>
-			<button label="再生" label_selected="再生" name="WLAnimSky"/>
-			<button label="停止" label_selected="停止" name="WLStopAnimSky"/>
-			<button label="不動産の時刻を使用" label_selected="不動産の時刻に変更" name="WLUseLindenTime"/>
-			<button label="デイテストを保存" label_selected="デイテストを保存" name="WLSaveDayCycle"/>
-			<button label="デイテストをロード" label_selected="デイテストをロード" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_env_settings.xml b/indra/newview/skins/default/xui/ja/floater_env_settings.xml
deleted file mode 100644
index 1d5f26a6eb..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_env_settings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="自然環境エディター">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		時刻
-	</text>
-	<text name="EnvTimeText2">
-		正午 12:00
-	</text>
-	<text name="EnvCloudText">
-		雲の量
-	</text>
-	<text name="EnvWaterColorText">
-		水の色
-	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="クリックしてカラーピッカーを開きます"/>
-	<text name="EnvWaterFogText">
-		水中照度
-	</text>
-	<button label="不動産の時刻を使用" name="EnvUseEstateTimeButton"/>
-	<button label="空の高度な設定" name="EnvAdvancedSkyButton"/>
-	<button label="水の高度な設定" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_water.xml b/indra/newview/skins/default/xui/ja/floater_water.xml
deleted file mode 100644
index fb64332e79..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_water.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="水の高度な編集">
-	<floater.string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		水の事前設定：
-	</text>
-	<button label="新規" label_selected="新規" name="WaterNewPreset"/>
-	<button label="保存" label_selected="保存" name="WaterSavePreset"/>
-	<button label="削除" label_selected="削除" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="設定" name="Settings">
-			<text name="BHText">
-				水中のフォグ効果の色
-			</text>
-			<color_swatch name="WaterFogColor" tool_tip="クリックしてカラーピッカーを開きます"/>
-			<text name="WaterFogDensText">
-				水中の透明度指数
-			</text>
-			<text name="WaterUnderWaterFogModText">
-				水中のフォグ効果加減
-			</text>
-			<text name="BDensText">
-				さざ波の反射スケール
-			</text>
-			<slider label="1" name="WaterNormalScaleX"/>
-			<slider label="2" name="WaterNormalScaleY"/>
-			<slider label="3" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				フレネルのスケール
-			</text>
-			<text name="FresnelOffsetText">
-				フレネルのオフセット
-			</text>
-			<text name="DensMultText">
-				水面の屈折スケール
-			</text>
-			<text name="WaterScaleBelowText">
-				水中の屈折スケール
-			</text>
-			<text name="MaxAltText">
-				不透明度の増幅
-			</text>
-		</panel>
-		<panel label="画像" name="Waves">
-			<text name="BHText">
-				大波の方向
-			</text>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				小波の方向
-			</text>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				ノーマルマップ
-			</text>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_windlight_options.xml b/indra/newview/skins/default/xui/ja/floater_windlight_options.xml
deleted file mode 100644
index feb94ef73e..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_windlight_options.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="空の高度な編集">
-	<text name="KeyFramePresetsText">
-		空の事前設定：
-	</text>
-	<button label="新規" label_selected="新規" name="WLNewPreset"/>
-	<button label="保存" label_selected="保存" name="WLSavePreset"/>
-	<button label="削除" label_selected="削除" name="WLDeletePreset"/>
-	<button label="デイサイクル編集" label_selected="デイサイクル編集" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="大気" name="Atmosphere">
-			<text name="BHText">
-				空の配色
-			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				空と遠景の露光
-			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				空の配色と濃度
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				大気の不透明度
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				大気の不透明度の増幅
-			</text>
-			<button label="?" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				視界の増幅
-			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				最大高度
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="ライティング" name="Lighting">
-			<text name="SLCText">
-				太陽/月の色
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				太陽/月の位置
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				アンビエント
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				東の角度
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				太陽の輝き
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="フォーカス " name="WLGlowB"/>
-			<slider label="サイズ    " name="WLGlowR"/>
-			<text name="SceneGammaText">
-				風景ガンマ
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				星の輝き
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="雲" name="Clouds">
-			<text name="WLCloudColorText">
-				雲の色
-			</text>
-			<button label="?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				雲の XY/密度
-			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				雲の量
-			</text>
-			<button label="?" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				雲のスケール
-			</text>
-			<button label="?" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				雲の詳細 (XY/密度)
-			</text>
-			<button label="?" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				雲の移動速度 (X 方向)
-			</text>
-			<button label="?" name="WLCloudScrollXHelp"/>
-			<check_box label="ロック" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				雲の移動速度 (Y 方向)
-			</text>
-			<button label="?" name="WLCloudScrollYHelp"/>
-			<check_box label="ロック" name="WLCloudLockY"/>
-			<check_box label="従来の雲を描画" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml
deleted file mode 100644
index 1f3e045a75..0000000000
--- a/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="DAGCYCLUS EDITOR">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Dagcyclus" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				0:00
-			</text>
-			<text name="WL3am">
-				3:00
-			</text>
-			<text name="WL6am">
-				6:00
-			</text>
-			<text name="WL9amHash">
-				9:00
-			</text>
-			<text name="WL12pmHash">
-				12:00
-			</text>
-			<text name="WL3pm">
-				15:00
-			</text>
-			<text name="WL6pm">
-				18:00
-			</text>
-			<text name="WL9pm">
-				21:00
-			</text>
-			<text name="WL12am2">
-				0:00
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Key toevoegen" label_selected="Key toevoegen" name="WLAddKey"/>
-			<button label="Key verwijderen" label_selected="Key verwijderen" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Gemarkeerde frame instelling:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Markering tijd:
-			</text>
-			<spinner label="Uur" name="WLCurKeyHour"/>
-			<spinner label="Min" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Markering voorinstelling:
-			</text>
-			<combo_box label="Voorinstelling" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Snap:
-			</text>
-			<combo_box label="5 min" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Lengte van cyclus:
-			</text>
-			<spinner label="Uur" name="WLLengthOfDayHour"/>
-			<spinner label="Min" name="WLLengthOfDayMin"/>
-			<spinner label="Sec" name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Voorbeeld:
-			</text>
-			<button label="Afspelen" label_selected="Afspelen" name="WLAnimSky"/>
-			<button label="Stop!" label_selected="Stop" name="WLStopAnimSky"/>
-			<button label="Gebruik estatetijd" label_selected="Ga naar Estate tijd" name="WLUseLindenTime"/>
-			<button label="Opslaan testdag" label_selected="Opslaan testdag" name="WLSaveDayCycle"/>
-			<button label="Laad testdag" label_selected="Laad testdag" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_env_settings.xml b/indra/newview/skins/default/xui/nl/floater_env_settings.xml
deleted file mode 100644
index 3c207040d2..0000000000
--- a/indra/newview/skins/default/xui/nl/floater_env_settings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="OMGEVING EDITOR">
-	<text bottom="-42" name="EnvTimeText">
-		Tijd van de 
-dag
-	</text>
-	<text bottom_delta="-36" name="EnvTimeText2">
-		0:00
-	</text>
-	<text name="EnvCloudText">
-		Wolkendek
-	</text>
-	<text name="EnvWaterColorText">
-		Waterkleur
-	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Klik om de kleurkiezer te openen"/>
-	<text name="EnvWaterFogText">
-		Watermist
-	</text>
-	<button label="Gebruik estate tijd" name="EnvUseEstateTimeButton"/>
-	<button label="Geavanceerde lucht" name="EnvAdvancedSkyButton"/>
-	<button label="Geavanceerd water" name="EnvAdvancedWaterButton"/>
-	<button label="?" name="EnvSettingsHelpButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_water.xml b/indra/newview/skins/default/xui/nl/floater_water.xml
deleted file mode 100644
index 1fb1ca241b..0000000000
--- a/indra/newview/skins/default/xui/nl/floater_water.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="GEAVANCEERDE WATER EDITOR">
-	<combo_box bottom="-50" height="18" left_delta="116" name="WaterPresetsCombo" width="150" />
-	<text name="KeyFramePresetsText">
-		Watervoorinstellingen
-	</text>
-	<button label="Nieuw" label_selected="Nieuw" name="WaterNewPreset" left_delta="190"/>
-	<button label="Opslaan" label_selected="Opslaan" name="WaterSavePreset"/>
-	<button label="Verwijderen" label_selected="Verwijderen" name="WaterDeletePreset" width="80"/>
-	<tab_container name="Water Tabs">
-		<panel label="Instellingen" name="Settings">
-			<text name="BHText">
-				Watermistkleur
-			</text>
-			<button label="?" name="WaterFogColorHelp"/>
-			<color_swatch label="" name="WaterFogColor" tool_tip="Klik om de kleurkiezer te openen"/>
-			<text name="WaterFogDensText">
-				Mistdichtheidsexponent
-			</text>
-			<button label="?" name="WaterFogDensityHelp"/>
-			<text name="WaterUnderWaterFogModText">
-				Onderwatermist wijziger
-			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp"/>
-			<text name="BDensText">
-				Reflectie wavelet schaal
-			</text>
-			<button label="?" name="WaterNormalScaleHelp"/>
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<text name="HDText">
-				Fresnelschaal
-			</text>
-			<button label="?" name="WaterFresnelScaleHelp"/>
-			<text name="FresnelOffsetText">
-				Fresnelverplaatsing
-			</text>
-			<button label="?" name="WaterFresnelOffsetHelp"/>
-			<text name="DensMultText">
-				Refractieschaal boven
-			</text>
-			<button label="?" name="WaterScaleAboveHelp"/>
-			<text name="WaterScaleBelowText">
-				Refractieschaal onder
-			</text>
-			<button label="?" name="WaterScaleBelowHelp"/>
-			<text name="MaxAltText">
-				Wazigheidvermeerderaar
-			</text>
-			<button label="?" name="WaterBlurMultiplierHelp"/>
-		</panel>
-		<panel label="Afbeelding" name="Waves">
-			<text name="BHText">
-				Grote golven richting
-			</text>
-			<button label="?" name="WaterWave1Help"/>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Kleine golf richting
-			</text>
-			<button label="?" name="WaterWave2Help"/>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Normaalmap
-			</text>
-			<button label="?" name="WaterNormalMapHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_windlight_options.xml b/indra/newview/skins/default/xui/nl/floater_windlight_options.xml
deleted file mode 100644
index b26dd7916e..0000000000
--- a/indra/newview/skins/default/xui/nl/floater_windlight_options.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="GEAVANCEERDE LUCHT EDITOR">
-	<combo_box allow_text_entry="false" follows="left|top" mouse_opaque="true" name="WLPresetsCombo"/>
-	<text name="KeyFramePresetsText">
-		Lucht voorinstellingen
-	</text>
-	<button label="Nieuw" label_selected="Nieuw" name="WLNewPreset"/>
-	<button label="Opslaan" label_selected="Opslaan" name="WLSavePreset"/>
-	<button label="Verwijderen" label_selected="Verwijderen" name="WLDeletePreset"/>
-	<button label="Dag cyclus editor" label_selected="Dag cyclus editor" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="Atmosfeer" name="Atmosphere">
-			<text name="BHText">
-				Blauw Horizon
-			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Nevel horizon
-			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				Blauw dichtheid
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Nevel dichtheid
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				Dichtheidsfactor
-			</text>
-			<button label="?" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				Afstandsfactor
-			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				Max hoogte
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="Licht" name="Lighting">
-			<text name="SLCText">
-				Zon/maan kleur
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Zon/maan positie
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				Omgeving
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Oosthoek
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				Zonnegloed
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="Focus  " name="WLGlowB"/>
-			<slider label="Grootte" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Scenegamma
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				Ster helderheid
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="Wolken" name="Clouds">
-			<text name="WLCloudColorText">
-				Wolkenkleur
-			</text>
-			<button label="?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Wolken (XY/Dichtheid)
-			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Wolkenbedekking
-			</text>
-			<button label="?" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				Wolkenschaal
-			</text>
-			<button label="?" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				Wolkendetail (XY/Dichtheid)
-			</text>
-			<button label="?" name="WLCloudDetailHelp" left="404"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Wolk verplaatsing X
-			</text>
-			<button label="?" name="WLCloudScrollXHelp" left="600"/>
-			<check_box label="Vastzetten" name="WLCloudLockX" left="622"/>
-			<text name="WLCloudScrollYText">
-				Wolk verplaatsing Y
-			</text>
-			<button label="?" name="WLCloudScrollYHelp" left="600"/>
-			<check_box label="Vastzetten" name="WLCloudLockY" left="622"/>
-			<check_box label="Teken klassieke wolken" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp" left="620"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml
deleted file mode 100644
index f3929df3e3..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="EDYTOR CYKLU DNIA">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Cykl dnia" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<multi_slider label="" name="WLTimeSlider"/>
-			<multi_slider label="" name="WLDayCycleKeys"/>
-			<text name="WL12am">
-				12am
-			</text>
-			<text name="WL3am">
-				3am
-			</text>
-			<text name="WL6am">
-				6am
-			</text>
-			<text name="WL9amHash">
-				9am
-			</text>
-			<text name="WL12pmHash">
-				12pm
-			</text>
-			<text name="WL3pm">
-				3pm
-			</text>
-			<text name="WL6pm">
-				6pm
-			</text>
-			<text name="WL9pm">
-				9pm
-			</text>
-			<text name="WL12am2">
-				12am
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Dodaj" label_selected="Dodaj" name="WLAddKey"/>
-			<button label="Usuń" label_selected="Usuń" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Preferencje czasu:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Czas:
-			</text>
-			<spinner label="Godz" name="WLCurKeyHour"/>
-			<spinner label="Min" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Ustawienia:
-			</text>
-			<combo_box label="Preset" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Przerwij:
-			</text>
-			<combo_box label="5 min" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Długość cyklu:
-			</text>
-			<spinner label="Godz" name="WLLengthOfDayHour"/>
-			<spinner label="Min" name="WLLengthOfDayMin"/>
-			<spinner label="Sek" name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Przeglądaj:
-			</text>
-			<button label="Start" label_selected="Start" name="WLAnimSky"/>
-			<button label="Stop" label_selected="Stop" name="WLStopAnimSky"/>
-			<button label="Używaj czasu regionu" label_selected="Używaj czasu regionu" name="WLUseLindenTime"/>
-			<button label="Zapisz test dnia" label_selected="Zapisz test dnia" name="WLSaveDayCycle"/>
-			<button label="Załaduj test dnia" label_selected="Załaduj test dnia" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_env_settings.xml b/indra/newview/skins/default/xui/pl/floater_env_settings.xml
deleted file mode 100644
index 3ab854fbbb..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_env_settings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="EDYTOR ŚRODOWISKA">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Czas
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<slider label="" name="EnvTimeSlider"/>
-	<text name="EnvCloudText">
-		Chmury:
-	</text>
-	<slider label="" name="EnvCloudSlider"/>
-	<text name="EnvWaterColorText">
-		Kolor wody
-	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Kliknij aby wybrać kolor"/>
-	<text name="EnvWaterFogText">
-		Zamglenie:
-	</text>
-	<slider label="" name="EnvWaterFogSlider"/>
-	<button label="Używaj czasu regionu" name="EnvUseEstateTimeButton"/>
-	<button label="Zaawansowane niebo" name="EnvAdvancedSkyButton"/>
-	<button label="Zaawansowana woda" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_water.xml b/indra/newview/skins/default/xui/pl/floater_water.xml
deleted file mode 100644
index 9720dae516..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_water.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="ZAAWANSOWANY EDYTOR WODY">
-	<text name="KeyFramePresetsText">
-		Ustawienia wody:
-	</text>
-	<button label="Nowe" label_selected="Nowe" name="WaterNewPreset"/>
-	<button label="Zapisz" label_selected="Zapisz" name="WaterSavePreset"/>
-	<button label="Usuń" label_selected="Usuń" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="USTAWIENIA" name="Settings">
-			<text name="BHText">
-				Kolor podwodnej mgły
-			</text>
-			<button label="?" name="WaterFogColorHelp"/>
-			<color_swatch label="" name="WaterFogColor" tool_tip="Kliknij aby wybrać kolor"/>
-			<text name="WaterFogDensText">
-				Wykładnik gęstości mgły
-			</text>
-			<button label="?" name="WaterFogDensityHelp"/>
-			<slider label="" name="WaterFogDensity"/>
-			<text name="WaterUnderWaterFogModText">
-				Modyfikator mgły
-			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp"/>
-			<slider label="" name="WaterUnderWaterFogMod"/>
-			<text name="BDensText">
-				Skala zmarszczeń
-			</text>
-			<button label="?" name="WaterNormalScaleHelp"/>
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<slider label="" name="WaterNormalScaleX"/>
-			<slider label="" name="WaterNormalScaleY"/>
-			<slider label="" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Skala Fresnela
-			</text>
-			<button label="?" name="WaterFresnelScaleHelp"/>
-			<slider label="" name="WaterFresnelScale"/>
-			<text name="FresnelOffsetText">
-				Przesunięcie Fresnela
-			</text>
-			<button label="?" name="WaterFresnelOffsetHelp"/>
-			<slider label="" name="WaterFresnelOffset"/>
-			<text name="DensMultText">
-				Górna refrakcja
-			</text>
-			<button label="?" name="WaterScaleAboveHelp"/>
-			<slider label="" name="WaterScaleAbove"/>
-			<text name="WaterScaleBelowText">
-				Dolna refrakcja
-			</text>
-			<button label="?" name="WaterScaleBelowHelp"/>
-			<slider label="" name="WaterScaleBelow"/>
-			<text name="MaxAltText">
-				Mnożnik rozmycia
-			</text>
-			<button label="?" name="WaterBlurMultiplierHelp"/>
-			<slider label="" name="WaterBlurMult"/>
-		</panel>
-		<panel label="OBRAZ" name="Waves">
-			<text name="BHText">
-				Kierunek dużych fal
-			</text>
-			<button label="?" name="WaterWave1Help"/>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<slider label="" name="WaterWave1DirX"/>
-			<slider label="" name="WaterWave1DirY"/>
-			<text name="BHText2">
-				Kierunek małych fal
-			</text>
-			<button label="?" name="WaterWave2Help"/>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<slider label="" name="WaterWave2DirX"/>
-			<slider label="" name="WaterWave2DirY"/>
-			<text name="BHText3">
-				Mapa normalnych
-			</text>
-			<button label="?" name="WaterNormalMapHelp"/>
-			<texture_picker label="" name="WaterNormalMap"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_windlight_options.xml b/indra/newview/skins/default/xui/pl/floater_windlight_options.xml
deleted file mode 100644
index 930e904464..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_windlight_options.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="ZAAWANSOWANY EDYTOR NIEBA">
-	<text name="KeyFramePresetsText">
-		Ustawienia nieba:
-	</text>
-	<button label="Nowe" label_selected="Nowe" name="WLNewPreset"/>
-	<button label="Zapisz" label_selected="Zapisz" name="WLSavePreset"/>
-	<button label="Usuń" label_selected="Usuń" name="WLDeletePreset"/>
-	<button label="Edytor cyklu dnia" label_selected="Edytor cyklu dnia" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSFERA" name="Atmosphere">
-			<text name="BHText">
-				Horyzont błękitu
-			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<slider label="" name="WLBlueHorizonR"/>
-			<slider label="" name="WLBlueHorizonG"/>
-			<slider label="" name="WLBlueHorizonB"/>
-			<slider label="" name="WLBlueHorizonI"/>
-			<text name="BDensText">
-				Horyzont zamglenia
-			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
-			<slider label="" name="WLHazeHorizon"/>
-			<text name="BDensText2">
-				Gęstość błękitu
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<slider label="" name="WLBlueDensityR"/>
-			<slider label="" name="WLBlueDensityG"/>
-			<slider label="" name="WLBlueDensityB"/>
-			<slider label="" name="WLBlueDensityI"/>
-			<text name="HDText">
-				Gęstość zamglenia
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<slider label="" name="WLHazeDensity"/>
-			<text name="DensMultText">
-				Mnożnik gęsości
-			</text>
-			<button label="?" name="WLDensityMultHelp"/>
-			<slider label="" name="WLDensityMult"/>
-			<text name="WLDistanceMultText">
-				Mnożnik dystansu
-			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
-			<slider label="" name="WLDistanceMult"/>
-			<text name="MaxAltText">
-				Max wysokość
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
-			<slider label="" name="WLMaxAltitude"/>
-		</panel>
-		<panel label="ŚWIATŁO" name="Lighting">
-			<text name="SLCText">
-				Kolor Słońca/Księżyca
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<slider label="" name="WLSunlightR"/>
-			<slider label="" name="WLSunlightG"/>
-			<slider label="" name="WLSunlightB"/>
-			<slider label="" name="WLSunlightI"/>
-			<text name="TODText">
-				Pozycja Słońca/Księżyca
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<slider label="" name="WLSunAngle"/>
-			<text name="WLAmbientText">
-				Otoczenie
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<slider label="" name="WLAmbientR"/>
-			<slider label="" name="WLAmbientG"/>
-			<slider label="" name="WLAmbientB"/>
-			<slider label="" name="WLAmbientI"/>
-			<text name="WLEastAngleText">
-				Pozycja wschodu
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<slider label="" name="WLEastAngle"/>
-			<text name="SunGlowText">
-				Blask Słońca
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="Ostrość" name="WLGlowB"/>
-			<slider label="Rozmiar" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Jasność obrazu
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<slider label="" name="WLGamma"/>
-			<text name="WLStarText">
-				Blask gwiazd
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-			<slider label="" name="WLStarAlpha"/>
-		</panel>
-		<panel label="CHMURY" name="Clouds">
-			<text name="WLCloudColorText">
-				Kolor chmur
-			</text>
-			<button label="?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<slider label="" name="WLCloudColorR"/>
-			<slider label="" name="WLCloudColorG"/>
-			<slider label="" name="WLCloudColorB"/>
-			<slider label="" name="WLCloudColorI"/>
-			<text name="WLCloudColorText2">
-				Chmury (XY/Gęstość)
-			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<slider label="" name="WLCloudX"/>
-			<slider label="" name="WLCloudY"/>
-			<slider label="" name="WLCloudDensity"/>
-			<text name="WLCloudCoverageText">
-				Pokrycie chmur
-			</text>
-			<button label="?" name="WLCloudCoverageHelp"/>
-			<slider label="" name="WLCloudCoverage"/>
-			<text name="WLCloudScaleText">
-				Skala chmur
-			</text>
-			<button label="?" name="WLCloudScaleHelp"/>
-			<slider label="" name="WLCloudScale"/>
-			<text name="WLCloudDetailText">
-				Szczegóły (XY/gęstość)
-			</text>
-			<button label="?" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				G
-			</text>
-			<slider label="" name="WLCloudDetailX"/>
-			<slider label="" name="WLCloudDetailY"/>
-			<slider label="" name="WLCloudDetailDensity"/>
-			<text name="WLCloudScrollXText">
-				Przewijanie chmur X
-			</text>
-			<button label="?" name="WLCloudScrollXHelp"/>
-			<check_box label="Zablokuj" name="WLCloudLockX"/>
-			<slider label="" name="WLCloudScrollX"/>
-			<text name="WLCloudScrollYText">
-				Przewijanie chmur Y
-			</text>
-			<button label="?" name="WLCloudScrollYHelp"/>
-			<check_box label="Zablokuj" name="WLCloudLockY"/>
-			<slider label="" name="WLCloudScrollY"/>
-			<check_box label="Klasyczne chmury" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
deleted file mode 100644
index 9560a3b418..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="EDITOR DE CICLO DE DIA">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Ciclo do dia" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				0:00
-			</text>
-			<text name="WL3am">
-				3:00
-			</text>
-			<text name="WL6am">
-				6:00
-			</text>
-			<text name="WL9amHash">
-				9:00
-			</text>
-			<text name="WL12pmHash">
-				12:00
-			</text>
-			<text name="WL3pm">
-				15:00
-			</text>
-			<text name="WL6pm">
-				18:00
-			</text>
-			<text name="WL9pm">
-				21:00
-			</text>
-			<text name="WL12am2">
-				24:00
-			</text>
-			<button label="Adicionar chave" label_selected="Adicionar chave" name="WLAddKey"/>
-			<button label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Configurações de Quadro-chave:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Tempo-chave:
-			</text>
-			<spinner label="Hora" name="WLCurKeyHour"/>
-			<spinner label="Minutos" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Ajuste-chave:
-			</text>
-			<combo_box label="Ajuste" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Grudar:
-			</text>
-			<combo_box label="5 minutos" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Duração do Ciclo:
-			</text>
-			<spinner label="Hora" name="WLLengthOfDayHour"/>
-			<spinner label="Min." name="WLLengthOfDayMin"/>
-			<spinner label="Seg." name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Visualizar
-			</text>
-			<button label="Tocar" label_selected="Tocar" name="WLAnimSky"/>
-			<button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/>
-			<button label="Usar o horário da Propriedade" label_selected="Ir para o horário da Propriedade" name="WLUseLindenTime"/>
-			<button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/>
-			<button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_env_settings.xml b/indra/newview/skins/default/xui/pt/floater_env_settings.xml
deleted file mode 100644
index 3ca8d934c9..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_env_settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="EDITOR DO AMBIENTE">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Hora do Dia
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<text name="EnvCloudText">
-		Cobertura de
-Nuvens
-	</text>
-	<text name="EnvWaterColorText">
-		Cor da água
-	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Selecionar a cor"/>
-	<text name="EnvWaterFogText">
-		Névoa da
-água
-	</text>
-	<button bottom="-144" label="Usar hora da propriedade" name="EnvUseEstateTimeButton" width="155"/>
-	<button label="Céu Avançado" left="167" name="EnvAdvancedSkyButton" width="155"/>
-	<button label="Água Avançada" left="326" name="EnvAdvancedWaterButton" width="155"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_water.xml b/indra/newview/skins/default/xui/pt/floater_water.xml
deleted file mode 100644
index b2a06f4ff2..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_water.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="EDITOR DE ÁGUA AVANÇADO">
-	<text name="KeyFramePresetsText" width="175">
-		Pré-configurações da Água:
-	</text>
-	<combo_box left_delta="175" name="WaterPresetsCombo" width="150"/>
-	<button label="Novo" label_selected="Novo" name="WaterNewPreset"/>
-	<button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/>
-	<button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="DEFINIÇÕES" name="Settings">
-			<text name="BHText">
-				Cor da névoa da Água
-			</text>
-			<button label="?" name="WaterFogColorHelp"/>
-			<color_swatch label="" name="WaterFogColor" tool_tip="Selecionar a cor"/>
-			<text name="WaterFogDensText">
-				Expoente da Densidade de névoa
-			</text>
-			<button label="?" left="209" name="WaterFogDensityHelp"/>
-			<text name="WaterUnderWaterFogModText">
-				Modificador da névoa Subaquática
-			</text>
-			<button label="?" left="209" name="WaterUnderWaterFogModHelp"/>
-			<text name="BDensText">
-				Escala da Marola de Reflexão
-			</text>
-			<button label="?" left="415" name="WaterNormalScaleHelp"/>
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<text name="HDText">
-				Escala de Fresnel
-			</text>
-			<button label="?" left="415" name="WaterFresnelScaleHelp"/>
-			<text name="FresnelOffsetText">
-				Deslocamento de Fresnel
-			</text>
-			<button label="?" left="415" name="WaterFresnelOffsetHelp"/>
-			<text name="DensMultText">
-				Refratar a Escala para Cima
-			</text>
-			<button label="?" left="640" name="WaterScaleAboveHelp"/>
-			<text name="WaterScaleBelowText">
-				Refratar a Escala para Baixo
-			</text>
-			<button label="?" left="640" name="WaterScaleBelowHelp"/>
-			<text name="MaxAltText">
-				Multiplicador de Difusão
-			</text>
-			<button label="?" left="640" name="WaterBlurMultiplierHelp"/>
-		</panel>
-		<panel label="IMAGEM" name="Waves">
-			<text name="BHText">
-				Direção da Onda Maior
-			</text>
-			<button label="?" left="170" name="WaterWave1Help"/>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Direção da Onda Pequena
-			</text>
-			<button label="?" left="170" name="WaterWave2Help"/>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Mapa Normal
-			</text>
-			<button label="?" name="WaterNormalMapHelp"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
deleted file mode 100644
index ec459bbb26..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="EDITOR DE CÉU AVANÇADO">
-	<text name="KeyFramePresetsText" width="140">
-		Pré-definições de Céu:
-	</text>
-	<combo_box left_delta="140" name="WLPresetsCombo"/>
-	<button label="Novo" label_selected="Novo" name="WLNewPreset"/>
-	<button label="Salvar" label_selected="Salvar" left_delta="72" name="WLSavePreset"/>
-	<button label="Deletar" label_selected="Deletar" left_delta="72" name="WLDeletePreset"/>
-	<button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" left_delta="84" name="WLDayCycleMenuButton" width="150"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSFERA" name="Atmosphere">
-			<text name="BHText">
-				Horizonte Azul
-			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Horizonte da Neblina
-			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				Densidade de Azul
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Densidade da Neblina
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				Multiplicador de Densidade
-			</text>
-			<button label="?" left="635" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				Multiplicador de Distância
-			</text>
-			<button label="?" left="635" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				Altitude Máxima
-			</text>
-			<button label="?" left="635" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="ILUMINAÇÃO" name="Lighting">
-			<text name="SLCText">
-				Cor do Sol/Lua
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Posição do Sol/Lua
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				Ambiente
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Ângulo Leste
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				Brilho do Sol
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="Foco" name="WLGlowB"/>
-			<slider label="Tamanho" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Gamma da Cena
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				Brilho da Estrela
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="NUVENS" name="Clouds">
-			<text name="WLCloudColorText">
-				Cor da Nuvem
-			</text>
-			<button label="?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Densidade/ XY da Nuvem
-			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Cobertura da Nuvem
-			</text>
-			<button label="?" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				Escala da Nuvem
-			</text>
-			<button label="?" name="WLCloudScaleHelp"/>
-			<text font="SansSerifSmall" name="WLCloudDetailText">
-				Detalhe da Nuvem (XY/Densidade)
-			</text>
-			<button label="?" left="421" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Rolagem X da Nuvem
-			</text>
-			<button label="?" name="WLCloudScrollXHelp"/>
-			<check_box label="Travar" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Rolagem Y da Nuvem
-			</text>
-			<button label="?" name="WLCloudScrollYHelp"/>
-			<check_box label="Travar" name="WLCloudLockY"/>
-			<check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/>
-			<button label="?" left="645" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
deleted file mode 100644
index 28d2ba6ed4..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="日循環編輯器">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="日循環" name="Day Cycle">
-			<multi_slider initial_value="0" name="WLTimeSlider"/>
-			<multi_slider initial_value="0" name="WLDayCycleKeys"/>
-			<text name="WL12am">
-				12am
-			</text>
-			<text name="WL3am">
-				3am
-			</text>
-			<text name="WL6am">
-				6am
-			</text>
-			<text name="WL9amHash">
-				9am
-			</text>
-			<text name="WL12pmHash">
-				12pm
-			</text>
-			<text name="WL3pm">
-				3pm
-			</text>
-			<text name="WL6pm">
-				6pm
-			</text>
-			<text name="WL9pm">
-				9pm
-			</text>
-			<text name="WL12am2">
-				12am
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Add Key" label_selected="Add Key" name="WLAddKey"/>
-			<button label="Delete Key" label_selected="Delete Key" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Key Frame Settings:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Key Time:
-			</text>
-			<spinner label="Hour" name="WLCurKeyHour"/>
-			<spinner label="Min" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Key Preset:
-			</text>
-			<combo_box label="Preset" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Snap:
-			</text>
-			<combo_box label="五分鐘" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Length of Cycle:
-			</text>
-			<spinner label="小時" name="WLLengthOfDayHour"/>
-			<spinner label="分" name="WLLengthOfDayMin"/>
-			<spinner label="秒" name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				預覽：
-			</text>
-			<button label="Play" label_selected="Play" name="WLAnimSky"/>
-			<button label="停止!" label_selected="停止" name="WLStopAnimSky"/>
-			<button label="Use Estate Time" label_selected="Go to Estate Time" name="WLUseLindenTime"/>
-			<button label="Save Test Day" label_selected="Save Test Day" name="WLSaveDayCycle"/>
-			<button label="Load Test Day" label_selected="Load Test Day" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_env_settings.xml b/indra/newview/skins/default/xui/zh/floater_env_settings.xml
deleted file mode 100644
index 65a97f0cff..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_env_settings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="ENVIRONMENT EDITOR">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Time of Day
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<text name="EnvCloudText">
-		Cloud Cover
-	</text>
-	<text name="EnvWaterColorText">
-		Water Color
-	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Click to open color picker"/>
-	<text name="EnvWaterFogText">
-		Water Fog
-	</text>
-	<button label="Use Estate Time" name="EnvUseEstateTimeButton"/>
-	<button label="Advanced Sky" name="EnvAdvancedSkyButton"/>
-	<button label="Advanced Water" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_water.xml b/indra/newview/skins/default/xui/zh/floater_water.xml
deleted file mode 100644
index 5fb57272af..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_water.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="進階水文編輯器">
-	<floater.string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		Water Presets:
-	</text>
-	<button label="新增" label_selected="新增" name="WaterNewPreset"/>
-	<button label="儲存" label_selected="儲存" name="WaterSavePreset"/>
-	<button label="刪除" label_selected="刪除" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="設定" name="Settings">
-			<text name="BHText">
-				Water Fog Color
-			</text>
-			<color_swatch name="WaterFogColor" tool_tip="點擊以開啟顏色挑選器"/>
-			<text name="WaterFogDensText">
-				Fog Density Exponent
-			</text>
-			<text name="WaterUnderWaterFogModText">
-				Underwater Fog Modifier
-			</text>
-			<text name="BDensText">
-				Reflection Wavelet Scale
-			</text>
-			<slider label="1" name="WaterNormalScaleX"/>
-			<slider label="2" name="WaterNormalScaleY"/>
-			<slider label="3" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Fresnel Scale
-			</text>
-			<text name="FresnelOffsetText">
-				Fresnel Offset
-			</text>
-			<text name="DensMultText">
-				Refract Scale Above
-			</text>
-			<text name="WaterScaleBelowText">
-				Refract Scale Below
-			</text>
-			<text name="MaxAltText">
-				Blur Multiplier
-			</text>
-		</panel>
-		<panel label="圖像" name="Waves">
-			<text name="BHText">
-				Big Wave Direction
-			</text>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Little Wave Direction
-			</text>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				正常地圖
-			</text>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
deleted file mode 100644
index fce851cc90..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="進階天空編輯器">
-	<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 name="KeyFramePresetsText">
-		Sky Presets:
-	</text>
-	<button label="新增" label_selected="新增" name="WLNewPreset"/>
-	<button label="儲存" label_selected="儲存" name="WLSavePreset"/>
-	<button label="刪除" label_selected="刪除" name="WLDeletePreset"/>
-	<button label="Day Cycle Editor" label_selected="Day Cycle Editor" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSPHERE" name="Atmosphere">
-			<text name="BHText">
-				Blue Horizon
-			</text>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Haze Horizon
-			</text>
-			<text name="BDensText2">
-				Blue Density
-			</text>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Haze Density
-			</text>
-			<text name="DensMultText">
-				Density Multiplier
-			</text>
-			<text name="WLDistanceMultText">
-				Distance Multiplier
-			</text>
-			<text name="MaxAltText">
-				Max Altitude
-			</text>
-		</panel>
-		<panel label="LIGHTING" name="Lighting">
-			<text name="SLCText">
-				Sun/Moon Color
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Sun/Moon Position
-			</text>
-			<text name="WLAmbientText">
-				Ambient
-			</text>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				East Angle
-			</text>
-			<text name="SunGlowText">
-				Sun Glow
-			</text>
-			<slider label="Focus" name="WLGlowB"/>
-			<slider label="尺寸" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Scene Gamma
-			</text>
-			<text name="WLStarText">
-				Star Brightness
-			</text>
-		</panel>
-		<panel label="CLOUDS" name="Clouds">
-			<text name="WLCloudColorText">
-				Cloud Color
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Cloud XY/Density
-			</text>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Cloud Coverage
-			</text>
-			<text name="WLCloudScaleText">
-				Cloud Scale
-			</text>
-			<text name="WLCloudDetailText">
-				Cloud Detail (XY/Density)
-			</text>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Cloud Scroll X
-			</text>
-			<check_box label="Lock" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Cloud Scroll Y
-			</text>
-			<check_box label="Lock" name="WLCloudLockY"/>
-			<check_box label="Draw Classic Clouds" name="DrawClassicClouds"/>
-		</panel>
-	</tab_container>
-</floater>
-- 
cgit v1.2.3


From 72c7525e677b8e5391abf5b552aa8d068f0e82d6 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 5 Jul 2011 16:07:09 -0700
Subject: EXP-916 FIX -- Folder in Inbox indicates loading when all items are
 displayed in folder

* Updated inbox inventory to not ever display the loading status like other inventory windows.
* show_load_status is now an optional parameter for LLInventoryPanel and LLFolderView.  Its
  default value is true but it is overridden to be false for the LLInboxInventoryPanel.

Reviewed by Richard.
---
 indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml | 2 ++
 indra/newview/skins/default/xui/en/widgets/inventory_panel.xml       | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml

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

diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
new file mode 100644
index 0000000000..830c27bdac
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_inventory_panel show_load_status="false" />
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
index 3164cc5eba..00f4c43915 100644
--- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
@@ -3,6 +3,7 @@
   bg_opaque_color="InventoryBackgroundColor"
   background_visible="true"
   background_opaque="true"
+  show_load_status="true"
   >
     <scroll
 		name="Inventory Scroller"
-- 
cgit v1.2.3


From aecfaef10c41dce7395c3a02dcd84a39b6ffbeee Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 5 Jul 2011 16:51:04 -0700
Subject: EXP-982 FIX As a user, I would like to see the new web-based profiles
 without any browser chrome and at an appropriate default size

---
 indra/newview/skins/default/xui/en/floater_media_browser.xml | 2 +-
 indra/newview/skins/default/xui/en/floater_web_content.xml   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index 43729d7c9f..5a1f920398 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -5,7 +5,7 @@
  height="440"
  layout="topleft"
  min_height="140"
- min_width="467"
+ min_width="0"
  name="floater_about"
  help_topic="floater_about"
  save_rect="true"
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index e04a72cbc0..a62ff21589 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -18,6 +18,7 @@
     follows="left|right|top|bottom"
     layout="topleft"
     left="5"
+    animate="false"
     name="stack1"
     orientation="vertical"
     top="20"
@@ -156,14 +157,18 @@
       name="external_controls"
       top_delta="0"
       user_resize="false"
+      auto_resize="true"
       width="585">
       <web_browser
-        bottom="-22"
+        bottom="-2"
         follows="all"
         layout="topleft"
         left="0"
         name="webbrowser"
         top="0"/>
+    </layout_panel>
+    <layout_panel name="status_bar" 
+                  height="23">
       <text
         type="string"
         length="200"
@@ -174,7 +179,7 @@
         name="statusbartext"
         parse_urls="false"
         text_color="0.4 0.4 0.4 1"
-        top_pad="5"
+        top_pad="3"
         width="495"/>
       <progress_bar
         color_bar="0.3 1.0 0.3 1"
-- 
cgit v1.2.3


From 3d3ec0a29486b3d8fe9d6995d280d43f86e57f26 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 6 Jul 2011 22:24:22 +0300
Subject: STORM-1479 FIXED Duplicated IDs in the Edit Day Cycle floater.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
index 7aae966879..d9a3ad0c4b 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
@@ -67,7 +67,7 @@
      height="10"
      layout="topleft"
      left="10"    
-     name="water_color_label"
+     name="hint_item1"
      top="100"
      width="300">
      - Click on a tab to edit the specific sky settings and time.
@@ -76,7 +76,7 @@
      follows="left|top|right"
      height="10"
      layout="topleft"    
-     name="water_color_label"
+     name="hint_item2"
      top_pad="10"
      width="300">
      - Click and drag the tabs to set the transition times.
@@ -85,7 +85,7 @@
      follows="left|top|right"
      height="10"
      layout="topleft"
-     name="water_color_label"
+     name="hint_item3"
      top_pad="10"
      width="300">
      - Use the scrubber to preview your day cycle.
@@ -402,7 +402,7 @@
      height="16"
      layout="topleft"
      left_delta="192"
-     name="WLCurKeyTimeText2"
+     name="WLCurKeyPresetText"
      top_pad="10"
      width="80">
         Sky Setting:
@@ -423,7 +423,7 @@
      height="16"
      layout="topleft"
      left_delta="-40"
-     name="WLCurKeyTimeText2"
+     name="WLCurKeyTimeText"
      top_pad="15"
      width="35">
         Time:
-- 
cgit v1.2.3


From caff254c9155b55412556c9270bec4b114d83270 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 6 Jul 2011 18:43:52 -0700
Subject: EXP-847 FIX As a user, I would like to see the How To floater appear
 the first time I log in to basic mode

---
 indra/newview/skins/default/xui/en/floater_help_browser.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
index 02e50ee584..de6d586f72 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -2,6 +2,8 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
+ left="10000"
+ bottom="10000"
  height="600"
  layout="topleft"
  min_height="150"
-- 
cgit v1.2.3


From 4ec383808b7f45072875c8315a245b13941272ee Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 6 Jul 2011 19:04:08 -0700
Subject: EXP-982 FIX As a user, I wuold like to see the new web-based profiles
 without any browser chrome fixed status bar resizing to take up too much
 space

---
 indra/newview/skins/default/xui/en/floater_web_content.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index a62ff21589..69e6057556 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -168,7 +168,9 @@
         top="0"/>
     </layout_panel>
     <layout_panel name="status_bar" 
-                  height="23">
+                  height="23"
+                  auto_resize="false"
+                  user_resize="false">
       <text
         type="string"
         length="200"
-- 
cgit v1.2.3


From 27afebcae1c09f3238b7e6b244763884457da60a Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 7 Jul 2011 20:37:32 +0300
Subject: STORM-1484 FIXED Restored Apply button in the Estate tab of the
 REGION / ESTATE floater.

---
 .../skins/default/xui/en/panel_region_estate.xml   | 29 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 450853993a..6b28639a77 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -79,13 +79,22 @@
         (unknown)
     </text>
 
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="95"
+     layout="topleft"
+     left="10"
+     top_pad="5"
+     width="470" />
+
     <check_box
      height="20"
      label="Allow Public Access"
      layout="topleft"
-     left="10"
+     left="20"
      name="externally_visible_check"
-     top_pad="6"
+     top_delta="5"
      width="200" />
 
     <check_box
@@ -104,6 +113,16 @@
      name="allow_direct_teleport"
      top_pad="4"
      width="80" />
+    <button
+     enabled="false"
+     follows="left|top"
+     height="23"
+     label="Apply"
+     layout="topleft"
+     name="apply_btn"
+     top_pad="15"
+     left_delta="0"
+     width="97" />
 
     <text
      type="string"
@@ -111,9 +130,9 @@
      follows="top|left"
      height="16"
      layout="topleft"
-     left="32"
+     left="20"
      name="Only Allow"
-     top_delta="0"
+     top_delta="-30"
      width="278">
         Restrict Access to accounts verified by:
     </text>
@@ -146,7 +165,7 @@
      height="20"
      layout="topleft"
      name="estate_manager_label"
-     top_pad="10"
+     top_pad="30"
      left="10"
      width="200">
         Estate Managers:
-- 
cgit v1.2.3


From f5bd2109c27b098dd73a9578f1f032b6ff9e4c2d Mon Sep 17 00:00:00 2001
From: "simon@lindenlab.com" <simon@lindenlab.com>
Date: Thu, 7 Jul 2011 17:42:54 -0700
Subject: Revert code fo ER-1016 - "Remove ability for anyone to edit terrain"
 and muck with the "About Land" Options tab one more time.

---
 .../skins/default/xui/en/floater_about_land.xml    | 47 +++++++++++++---------
 1 file changed, 28 insertions(+), 19 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index ac186d7737..df6a9d82e2 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1206,7 +1206,8 @@ Only large parcels can be listed in search.
             </panel.string>
             <panel.string
              name="see_avs_text">
-                See and chat with avatars on this parcel
+                 Allow avatars on other parcels to see
+ and chat with avatars on this parcel
             </panel.string>
             <text
              type="string"
@@ -1218,9 +1219,18 @@ Only large parcels can be listed in search.
              left="10"
              name="allow_label"
              top="10"
-             width="270">
+             width="278">
                 Allow other Residents to:
             </text>
+            <check_box
+             height="16"
+             label="Edit Terrain"
+             layout="topleft"
+             left="14"
+             name="edit land check"
+             tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land."
+             top_pad="4"
+             width="147i" />
             <check_box
              height="16"
              label="Fly"
@@ -1228,7 +1238,7 @@ Only large parcels can be listed in search.
              name="check fly"
              tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."
              left_pad="4"
-             width="128" />
+             width="150" />
             <text
              type="string"
              length="1"
@@ -1308,15 +1318,6 @@ Only large parcels can be listed in search.
              name="check group scripts"
              top_delta="0"
              width="70" />
-          <check_box
-             height="16"
-             label="See Avatars"
-             layout="topleft"
-             left="14"
-             name="SeeAvatarsCheck"
-             tool_tip="Allow avatars on other parcels to see and chat with avatars on this parcel."
-             top_pad="5"
-             width="119" />
            <text
              type="string"
              text_color="white"
@@ -1337,7 +1338,7 @@ Only large parcels can be listed in search.
              name="check safe"
              tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."
              top_pad="5"
-             width="280" />
+             width="200" />
             <check_box
              height="16"
              label="No Pushing"
@@ -1354,7 +1355,7 @@ Only large parcels can be listed in search.
              left="14"
              name="ShowDirectoryCheck"
              tool_tip="Let people see this parcel in search results"
-             width="280" />
+             width="430" />
             <combo_box
              enabled="false"
              height="23"
@@ -1514,14 +1515,23 @@ Only large parcels can be listed in search.
              fallback_image="default_land_picture.j2c" 
              tool_tip="Click to choose a picture"
              width="195" />
+            <check_box
+             height="32"
+             label="See Avatars"
+             layout="topleft"
+             left="230"
+             top="164"
+             name="SeeAvatarsCheck"
+             tool_tip="Allows avatars on other parcels to see and chat with avatars on this parcel, and you to see and chat with them."
+             width="120" />
             <text
              type="string"
              length="1"
              follows="left|top"
              height="16"
              layout="topleft"
-             left="220"
-             top="180"
+             left="230"
+             top="230"
              text_color="white"
              name="landing_point"
              word_wrap="true"
@@ -1535,7 +1545,7 @@ Only large parcels can be listed in search.
              label_selected="Set"
              layout="topleft"
              name="Set"
-             right="-68"
+             left="230"
              tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."
              width="50" />
             <button
@@ -1547,7 +1557,6 @@ Only large parcels can be listed in search.
              left_pad="5"
              name="Clear"
              tool_tip="Clear the landing point"
-             right="-10"
              width="55" />
             <text
              type="string"
@@ -1556,7 +1565,7 @@ Only large parcels can be listed in search.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="220"
+             left="230"
              top_pad="10"
              name="Teleport Routing: "
              width="200">
-- 
cgit v1.2.3


From 48c0d9c517a2473c87058587318fa893c5229bfb Mon Sep 17 00:00:00 2001
From: prep linden <prep@lindenlab.com>
Date: Fri, 8 Jul 2011 11:43:04 -0400
Subject: Fix for sh-2012 removed upload wizard option

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a0d0c8625e..598f500e4f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -993,19 +993,7 @@
             <menu_item_call.on_visible
             function="File.VisibleUploadModel"/>
             </menu_item_call>
-			<menu_item_call
-           label="Model Wizard..."
-           layout="topleft"
-           name="Upload Model Wizard">
-				<menu_item_call.on_click
-				 function="Floater.Show"
-				 parameter="upload_model_wizard" />
-				<menu_item_call.on_enable
-				 function="File.EnableUploadModel" />
-				<menu_item_call.on_visible
-				function="File.VisibleUploadModel"/>
-			</menu_item_call>
-            <menu_item_call
+	   <menu_item_call
              label="Bulk (L$[COST] per file)..."
              layout="topleft"
              name="Bulk Upload">
-- 
cgit v1.2.3


From 4bc77c55039e46ac8def09ebe167aa9c84191e7a Mon Sep 17 00:00:00 2001
From: prep linden <prep@lindenlab.com>
Date: Fri, 8 Jul 2011 16:15:26 -0400
Subject: Fix for sh-2016

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 7f15de7236..701661ed3f 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -15,7 +15,7 @@
   <string name="low">Low</string>
   <string name="lowest">Lowest</string>
   <string name="mesh_status_good">Ship it!</string>
-  <string name="mesh_status_na">N/A</string>
+  <string name="mesh_status_na">N/A<c/string>
   <string name="mesh_status_none">None</string>
   <string name="mesh_status_submesh_mismatch">Levels of detail have a different number of textureable faces.</string>
   <string name="mesh_status_mesh_mismatch">Levels of detail have a different number of mesh instances.</string>
@@ -93,7 +93,7 @@
      top_pad="5"
      wrap="true"
      visible="false">
-     You will not be able to complete the final upload of this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to get certifed for mesh model uploads.
+     You will not be able to complete the final upload of this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to get enabled for mesh model uploads.
     </text>
 
   <tab_container
-- 
cgit v1.2.3


From 615cc856a8abf44f62c58962f8b53178f9708ee3 Mon Sep 17 00:00:00 2001
From: prep linden <prep@lindenlab.com>
Date: Fri, 8 Jul 2011 16:17:34 -0400
Subject: Fix for sh-2016 Removed extra char

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 701661ed3f..a5fa7fbf0b 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -15,7 +15,7 @@
   <string name="low">Low</string>
   <string name="lowest">Lowest</string>
   <string name="mesh_status_good">Ship it!</string>
-  <string name="mesh_status_na">N/A<c/string>
+  <string name="mesh_status_na">N/A</string>
   <string name="mesh_status_none">None</string>
   <string name="mesh_status_submesh_mismatch">Levels of detail have a different number of textureable faces.</string>
   <string name="mesh_status_mesh_mismatch">Levels of detail have a different number of mesh instances.</string>
-- 
cgit v1.2.3


From bef014ad2ab9496755ef266cdfaeb9f9c333b240 Mon Sep 17 00:00:00 2001
From: "simon@lindenlab.com" <simon@lindenlab.com>
Date: Fri, 8 Jul 2011 15:41:55 -0700
Subject: ER-910 cleanup:  removed a stale comment, tweaked text in About Land
 dialog Options tab.

---
 .../skins/default/xui/en/floater_about_land.xml    | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 5067ef7167..07cb4c12f5 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1207,8 +1207,7 @@ Only large parcels can be listed in search.
             </panel.string>
             <panel.string
              name="see_avs_text">
-                 Allow avatars on other parcels to see
- and chat with avatars on this parcel
+                 See and chat with residents on this parcel
             </panel.string>
             <text
              type="string"
@@ -1516,14 +1515,27 @@ Only large parcels can be listed in search.
              fallback_image="default_land_picture.j2c" 
              tool_tip="Click to choose a picture"
              width="195" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             text_color="white"
+             height="16"
+             layout="topleft"
+             left="230"
+             top="174"
+             name="allow_label5"
+             width="278">
+              Allow Residents on other parcels to:
+            </text>
             <check_box
-             height="32"
+             height="16"
              label="See Avatars"
+             follows="top"
              layout="topleft"
              left="230"
-             top="164"
              name="SeeAvatarsCheck"
-             tool_tip="Allows avatars on other parcels to see and chat with avatars on this parcel, and you to see and chat with them."
+             tool_tip="Allows residents on other parcels to see and chat with residents on this parcel, and you to see and chat with them."
              width="120" />
             <text
              type="string"
-- 
cgit v1.2.3


From 7029c8ff534419a3bcfd0e5fc39a4739e4cdc19c Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Sat, 9 Jul 2011 14:58:14 -0700
Subject: Fix for SH-2028.  Also fixed layout issues with new upload warning
 and upload price text when floater is resized.

---
 .../skins/default/xui/en/floater_model_preview.xml | 40 +++++++++++++++++-----
 1 file changed, 32 insertions(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index a5fa7fbf0b..52377b60c5 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -74,28 +74,50 @@
     follows="all"/>
     
     <text
-     follows="top|left"
      font="SansSerif"
+	 bottom_delta="15"
      left_delta="0"
      name="warning_title"
      text_color="Yellow"
-     top_pad="10"
      visible="false">
      WARNING:
     </text>
     <text
-     follows="top|left"
      text_color="White"
      height="50"
+	 width="290"
+	 top_delta="15"
      left_delta="0"
      name="warning_message"
      parse_urls="true"
-     top_pad="5"
      wrap="true"
      visible="false">
      You will not be able to complete the final upload of this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to get enabled for mesh model uploads.
     </text>
 
+  <text
+	height="50"
+	top_delta="55"
+	left_delta="0"
+	name="weights"
+	width="290"
+	word_wrap="true" 
+	>
+	<text
+		follows="top|left"
+	>Test0: [EQ]
+	</text>
+	<text
+	>Test: [ST]
+	</text>
+Streaming: [ST]
+Simulation: [SIM]
+Physics: [PH]
+Prim equivs: [EQ]
+  </text>
+  
+
+
   <tab_container
     follows="right|top|bottom"
     top="15"
@@ -407,12 +429,14 @@
 
   <text
 	height="16"
-	left="310"
-	name="weights"
+	left_delta="5"
+	bottom_delta="30"
+	name="upload_fee"
 	width="300"
+	follows="bottom|right"
 	word_wrap="true" 
-	top_pad="7">
-	    Prim equivs: [EQ] Physics: [PH] Upload fee: [FEE] L$
+	>
+	    Upload fee: L$ [FEE]
   </text>
   
   <button bottom="540" left="10"  follows="bottom|left" height="20" label="Set to defaults"
-- 
cgit v1.2.3


From 29d5413ea6c2d0782ab55916d9d9428ae00c1ace Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Sat, 9 Jul 2011 17:01:33 -0500
Subject: SH-2007 Code cleanup, expand minimum header size to 4KB, better
 comments around magic numbers, remove dead calcResourceCost

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 598f500e4f..4b068a1724 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1997,10 +1997,7 @@
              label="Show Upload Cost"
              layout="topleft"
              name="Show Upload Cost">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="DebugShowUploadCost" />
-            <menu_item_check.on_click
+          <menu_item_check.on_click
              function="ToggleControl"
              parameter="DebugShowUploadCost" />
           </menu_item_check>
-- 
cgit v1.2.3


From 782c8a48f1dd56db7c2e5546291d15b78741d455 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Sat, 9 Jul 2011 19:50:36 -0700
Subject: Added L$ price breakdown for model uploads

---
 .../skins/default/xui/en/floater_model_preview.xml | 70 ++++++++++++++++------
 1 file changed, 53 insertions(+), 17 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 52377b60c5..060ddec1f4 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -84,7 +84,7 @@
     </text>
     <text
      text_color="White"
-     height="50"
+     height="40"
 	 width="290"
 	 top_delta="15"
      left_delta="0"
@@ -92,31 +92,67 @@
      parse_urls="true"
      wrap="true"
      visible="false">
-     You will not be able to complete the final upload of this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to get enabled for mesh model uploads.
-    </text>
+     You will not be able to complete the final upload of this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to get enabled for mesh model uploads.</text>
 
   <text
-	height="50"
-	top_delta="55"
+	height="65"
+	top_delta="45"
 	left_delta="0"
+	name="weights_text"
+	width="80"
+	word_wrap="true" 
+	>
+Streaming:
+Physics:
+Simulation:
+
+Prim equivs:
+  </text>
+
+  <text
+	height="65"
+	top_delta="0"
+	left_delta="80"
 	name="weights"
-	width="290"
+	width="70"
 	word_wrap="true" 
 	>
-	<text
-		follows="top|left"
-	>Test0: [EQ]
-	</text>
-	<text
-	>Test: [ST]
-	</text>
-Streaming: [ST]
-Simulation: [SIM]
-Physics: [PH]
-Prim equivs: [EQ]
+[ST]
+[PH]
+[SIM]
+
+[EQ]
   </text>
   
+  <text
+	height="65"
+	top_delta="0"
+	left_delta="70"
+	name="price_breakdown_text"
+	width="80"
+	word_wrap="true" 
+	>
+Streaming:
+Physics:
+Instances:
+Textures:
+Model:
+  </text>
 
+  <text
+	height="65"
+	top_delta="0"
+	left_delta="80"
+	name="price_breakdown"
+	width="65"
+	word_wrap="true" 
+	>
+L$ [STREAMING]
+L$ [PHYSICS]
+L$ [INSTANCES]
+L$ [TEXTURES]
+L$ [MODEL]
+  </text>
 
   <tab_container
     follows="right|top|bottom"
-- 
cgit v1.2.3