From 00ce291f013ce434b202da675bfb38431014a077 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 17 Oct 2017 12:03:26 -0700
Subject: New prototype control for moving sun and moon in sky.

---
 .../default/xui/en/floater_edit_sky_preset.xml     | 31 ++++++++++++++++++++--
 .../skins/default/xui/en/widgets/joystick_quat.xml |  7 +++++
 .../default/xui/en/widgets/joystick_rotate.xml     |  4 +--
 3 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/joystick_quat.xml

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

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 56233d91ee..c03a206e88 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
@@ -454,7 +454,34 @@
              width="200">
                 Sun/Moon Position
             </text>
-            <multi_slider
+            
+            <joystick_quat
+              follows="left|top"
+              height="78"
+              layout="topleft"
+              left_delta="0"
+              name="WLSunRotation"
+              quadrant="left"
+              sound_flags="3"
+              visible="true"
+              tool_tip="Move sun in sky"
+              top="44"
+              width="78" />              />
+
+            <joystick_quat
+              follows="left|top"
+              height="78"
+              layout="topleft"
+              left_delta="96"
+              name="WLMoonRotation"
+              quadrant="left"
+              sound_flags="3"
+              visible="true"
+              tool_tip="Move moon in sky"
+              top="44"
+              width="78" />              />
+              
+            <!-- multi_slider
              can_edit_text="true"
              control_name="WLSunPos"
              decimal_digits="0"
@@ -644,7 +671,7 @@
              left_delta="10"
              name="WLEastAngle"
              top_pad="6"
-             width="200" />
+             width="200" / -->
 
         </panel>
         <panel
diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_quat.xml b/indra/newview/skins/default/xui/en/widgets/joystick_quat.xml
new file mode 100644
index 0000000000..a190da3909
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/joystick_quat.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<joystick_rotate
+   image_selected="Cam_Rotate_In"
+   image_unselected="Cam_Rotate_Out"
+   scale_image="false"
+   mouse_opaque="false"
+   held_down_delay.seconds="0"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
index a190da3909..cbf721b346 100644
--- a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
+++ b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<joystick_rotate
+<joystick_quat
    image_selected="Cam_Rotate_In"
    image_unselected="Cam_Rotate_Out"
-   scale_image="false"
+   scale_image="true"
    mouse_opaque="false"
    held_down_delay.seconds="0"/>
-- 
cgit v1.2.3


From b37eb2642f6e6e4d1e32a49c7ab31f70321cd979 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 10 Nov 2017 16:17:25 -0800
Subject: Remove delete preset dialog, Initial settings for selection level
 (Region/Parcel/Local)

---
 .../default/xui/en/floater_delete_env_preset.xml   | 59 ----------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml | 30 -----------
 2 files changed, 89 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_delete_env_preset.xml

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

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
deleted file mode 100644
index b5de4166f6..0000000000
--- a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<floater
- legacy_header_height="18"
- height="130"
- help_topic=""
- layout="topleft"
- name="Delete Env Preset"
- save_rect="true"
- 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>
-   
-    <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"
-     font="SansSerif"
-     height="10"
-     layout="topleft"
-     left="50"
-     name="label"
-     top="60"
-     width="60">
-     Preset:
-    </text>
-    <combo_box
-     follows="top|left"
-     layout="topleft"
-     left_pad="10"
-     name="preset_combo"
-     top_delta="-5"
-     width="200"/>
-    <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/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 92511167c0..551b643dab 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -731,16 +731,6 @@
 	     	 	 	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="World.EnvPreset"
-	     	 	 	parameter="delete_water"/>
-	     	 	 	<menu_item_call.on_enable
-	     	 	 	function="World.EnableEnvPreset"
-	     	 	 	parameter="delete_water"/>
-	     	 	</menu_item_call>
 	     	</menu>
 	     	
 	     	<menu
@@ -760,16 +750,6 @@
 	     	 	 	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="World.EnvPreset"
-	     	 	 	parameter="delete_sky"/>
-	     	 	 	<menu_item_call.on_enable
-	     	 	 	function="World.EnableEnvPreset"
-	     	 	 	parameter="delete_sky"/>
-	     	 	</menu_item_call>
 	     	</menu>
 	     	
 	     	<menu
@@ -789,16 +769,6 @@
 	     	 	 	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="World.EnvPreset"
-	     	 	 	parameter="delete_day_cycle"/>
-	     	 	 	<menu_item_call.on_enable
-	     	 	 	function="World.EnableEnvPreset"
-	     	 	 	parameter="delete_day_cycle"/>
-	     	 	</menu_item_call>
 	     	</menu>
 	    </menu>
     
-- 
cgit v1.2.3


From a0c228d84240a80437b63e0a2cd1cee24e8004a0 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 16 Jan 2018 11:03:26 -0800
Subject: MAINT-8052: Report if the returned environment is the default.

---
 .../skins/default/xui/en/floater_about_land.xml    |  12 +
 .../default/xui/en/floater_test_layout_stacks.xml  | 401 +++++++++------------
 .../default/xui/en/panel_region_environment.xml    | 317 ++++++++--------
 3 files changed, 364 insertions(+), 366 deletions(-)

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

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 535af317d9..334de8e3db 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -2109,5 +2109,17 @@ Only large parcels can be listed in search.
             class="land_experiences_panel"
           filename="panel_region_experiences.xml">
        </panel>
+       <panel
+          border="true"
+          follows="all"
+          label="ENVIRONMENT"
+          layout="topleft"
+          left="0"
+          top="0"
+          help_topic="land_environment_tab"
+          name="land_environment_panel"
+            class="land_environment_panel"
+          filename="panel_region_environment.xml">
+       </panel>
     </tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
index a04050e7eb..82ad031959 100644
--- a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
@@ -1,226 +1,181 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- can_resize="true"
- can_close="true"
- bevel_style="in"
- height="300"
- layout="topleft"
- min_height="40"
- min_width="420"
- name="Test Floater"
- title="LAYOUTSTACK TESTS"
- width="420">
-  <layout_stack name="test_stack"
-              left="0"
-              top="0"
-              width="100"
-              height="250"
-              follows="left|top|bottom"
-              orientation="vertical">
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  bg_alpha_color="blue"
-                  height="11"
-                  min_height="0"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  bg_alpha_color="blue"
-                  height="11"
-                  min_height="0"
-                  visible="false"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  bg_alpha_color="blue"
-                  height="11"
-                  min_height="0"
-                  visible="true"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  bg_alpha_color="blue"
-                  height="11"
-                  min_height="0"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-  </layout_stack>
-  <layout_stack name="test_stack"
-              left_pad="5"
-              top="0"
-              width="100"
-              height="250"
-              follows="left|top|bottom"
-              orientation="vertical">
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  bg_alpha_color="blue"
-                  height="100"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  visible="false"
-                  bg_alpha_color="blue"
-                  height="100"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-    <layout_panel name="fixed"
-                  auto_resize="false"
-                  user_resize="true"
-                  height="50"
-                  min_height="10"
-                  bg_alpha_color="green"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="black">fixed</text>
-    </layout_panel>
-    <layout_panel name="fixed"
-                auto_resize="false"
-                  user_resize="true"
-                height="50"
-                min_height="10"
-                bg_alpha_color="green"
-                background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="black">fixed</text>
-    </layout_panel>
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  bg_alpha_color="blue"
-                  height="100"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  bg_alpha_color="blue"
-                  height="100"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  bg_alpha_color="blue"
-                  height="100"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  bg_alpha_color="blue"
-                  height="100"
-                  visible="true"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-  </layout_stack>
-  <layout_stack name="test_stack"
-               left_pad="5"
-               top="0"
-               width="100"
-               height="250"
-               follows="left|top|bottom"
-               orientation="vertical">
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  height="11"
-                  bg_alpha_color="blue"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-    <layout_panel name="fixed"
-                auto_resize="false"
-                  user_resize="true"
-                height="50"
-                bg_alpha_color="green"
-                background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="black">fixed</text>
-    </layout_panel>
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  bg_alpha_color="blue"
-                  height="11"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-  </layout_stack>
-  <layout_stack name="test_stack"
-               left_pad="5"
-               top="0"
-               width="100"
-               height="250"
-               follows="left|top|bottom"
-               orientation="vertical">
-    <layout_panel name="fixed"
-                auto_resize="false"
-                  user_resize="true"
-                height="50"
-                bg_alpha_color="green"
-                background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="black">fixed</text>
-    </layout_panel>
-    <layout_panel name="fixed"
-                auto_resize="false"
-                  user_resize="true"
-                height="50"
-                bg_alpha_color="green"
-                background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="black">fixed</text>
-    </layout_panel>
-    <layout_panel name="fixed"
-                auto_resize="false"
-                  user_resize="true"
-                height="50"
-                bg_alpha_color="green"
-                background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="black">fixed</text>
-    </layout_panel>
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  bg_alpha_color="blue"
-                  height="11"
-                  min_height="0"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  bg_alpha_color="blue"
-                  height="11"
-                  min_height="0"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-    <layout_panel name="flex"
-                  auto_resize="true"
-                  user_resize="true"
-                  bg_alpha_color="blue"
-                  height="11"
-                  min_height="0"
-                  background_visible="true">
-      <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
-  </layout_stack>
+        can_resize="true"
+        can_close="true"
+        bevel_style="in"
+        height="300"
+        layout="topleft"
+        min_height="40"
+        min_width="420"
+        name="Test Floater"
+        title="LAYOUTSTACK TESTS"
+        width="420">
+    <layout_stack 
+            left="0"
+            top="0"
+            width="420"
+            height="250"
+            follows="left|right|top|bottom"
+            orientation="vertical">
+        <layout_panel 
+                auto_resize="true"
+                user_resize="true"
+                bg_alpha_color="red"
+                max_height="200"
+                background_visible="false">
+            <layout_stack 
+                    left="5"
+                    top="5"
+                    right="-5"
+                    follows="left|right|top|bottom"
+                    orientation="horizontal">
+                <layout_panel 
+                        border="true"
+                        bevel_style="in"
+                        auto_resize="false"
+                        user_resize="false"
+                        width="160"
+                        background_visible="true">
+                    <text follows="top|left"
+                            halign="left"
+                            text_color="white">Environment Source</text>
+                    <radio_group
+                            follows="top|left"
+                            height="45"
+                            layout="topleft"
+                            left_delta="10"
+                            name="environment_select_radio_group"
+                            bottom_delta="50"
+                            max_width="200"
+                            width="200">
+                        <radio_item
+                                label="Default Environment"
+                                layout="topleft"
+                                name="use_default_setting"
+                                height="20"/>
+                        <radio_item
+                                label="Custom Environment"
+                                layout="topleft"
+                                height="20"
+                                name="use_custom_setting"/>
+                    </radio_group>
+                    <button
+                            follows="top|left"
+                            height="23"
+                            label="Edit Custom"
+                            left_delta="30"
+                            bottom_delta="30"
+                            width="100"
+                            name="edit_btn"/>
+
+                </layout_panel>
+                <layout_panel 
+                        border="true"
+                        bevel_style="in"
+                        auto_resize="false"
+                        user_resize="true"
+                        height="11"
+                        width="220"
+                        background_visible="true">
+                    <text follows="top|left|right"
+                            halign="left"
+                            text_color="white">Day Settings</text>
+                    <text
+                            type="string"
+                            length="1"
+                            follows="left|top"
+                            height="12"
+                            layout="topleft"
+                            left_delta="10"
+                            top_pad="10"
+                            width="200">
+                        Day Length (hours)
+                    </text>
+                    <slider
+                            can_edit_text="true"
+                            control_name="DayLengthSLD"
+                            decimal_digits="1"
+                            follows="left|top"
+                            height="20"
+                            increment="0.5"
+                            initial_value="4"
+                            layout="topleft"
+                            left_delta="0"
+                            top_pad="6"
+                            name="day_length_sld"
+                            min_val="4"
+                            max_val="178"
+                            width="200" />
+                    <text
+                            type="string"
+                            length="1"
+                            follows="left|top"
+                            height="12"
+                            layout="topleft"
+                            left_delta="0"
+                            top_pad="10"
+                            width="200">
+                        Day Offset (hours)
+                    </text>
+                    <slider
+                            can_edit_text="true"
+                            control_name="DayOffsetSLD"
+                            decimal_digits="1"
+                            follows="left|top"
+                            height="20"
+                            increment="0.5"
+                            initial_value="-8"
+                            layout="topleft"
+                            left_delta="0"
+                            top_pad="6"
+                            name="day_offset_sld"
+                            min_val="-12"
+                            max_val="12"
+                            width="200" />
+
+                </layout_panel>
+                <layout_panel name="flex"
+                        auto_resize="true"
+                        user_resize="true"
+                        visible="false"
+                        bg_alpha_color="blue"
+                        height="100"
+                        background_visible="true">
+                </layout_panel>
+            </layout_stack>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                height="11"
+                min_height="0"
+                background_visible="false">
+    <check_box
+        control_name="may_override_chk"
+        height="16"
+        label="Parcel Owners May Override"
+        layout="topleft"
+        left="10"
+        top="10"
+        name="allow_override_chk"
+        width="200" />
+    <button
+        follows="bottom|left"
+        height="23"
+        label="Apply"
+        right="-160"
+        bottom="-30"
+        name="apply_btn"
+        width="100" />
+    <button
+        follows="bottom|left"
+        height="23"
+        label="Cancel"
+        layout="topleft"
+        left_pad="10"
+        name="cancel_btn"
+        width="100" /> 
+                
+        </layout_panel>
+    </layout_stack>
 </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
index aa38c49fae..a11b9b2d8b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -1,149 +1,180 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <panel
- border="true"
- follows="top|left"
- height="300"
- label="Environment"
- layout="topleft"
- help_topic="panel_region_environment_tab"
- 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 the following settings"
-   layout="topleft"
-   name="use_my_settings"
-   top_pad="20"/>
-  </radio_group>
- <panel
-  follows="top|left"
-  height="150"
-  layout="topleft"
-  left="50"
-  name="user_environment_settings"
-  top_pad="20"
-  width="430">
-   <text
-    name="water_settings_title"
+    border="true"
     follows="top|left"
-    height="16"
+    height="300"
+    label="Environment"
     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="Apply"
-  layout="topleft"
-  right="-160"
-  name="apply_btn"
-  top_pad="10"
-  width="100" />
- <button
-  follows="left|top"
-  height="23"
-  label="Cancel"
-  layout="topleft"
-  left_pad="10"
-  name="cancel_btn"
-  width="100" /> 
- <loading_indicator
-  height="23"
-  left="50"
-  name="progress_indicator"
-  top_delta="0"
-  visible="false"
-  width="23" />
+    help_topic="panel_region_environment_tab"
+    name="panel_env_info"
+    width="530"> 
+    <layout_stack 
+            left="0"
+            top="0"
+            width="420"
+            height="250"
+            follows="left|right|top|bottom"
+            orientation="vertical">
+        <layout_panel 
+                auto_resize="false"
+                user_resize="true"
+                bg_alpha_color="red"
+                min_height="130"
+                background_visible="false">
+            <layout_stack 
+                    left="5"
+                    top="5"
+                    right="-5"
+                    follows="left|right|top|bottom"
+                    orientation="horizontal">
+                <layout_panel 
+                        border="true"
+                        bevel_style="in"
+                        auto_resize="false"
+                        user_resize="false"
+                        width="160"
+                        background_visible="true">
+                    <text follows="top|left"
+                            halign="left"
+                            text_color="white">Environment Source</text>
+                    <radio_group
+                            follows="top|left"
+                            height="45"
+                            layout="topleft"
+                            left_delta="10"
+                            name="environment_select_radio_group"
+                            bottom_delta="50"
+                            max_width="200"
+                            width="200">
+                        <radio_item
+                                label="Default Environment"
+                                layout="topleft"
+                                name="use_default_setting"
+                                height="20"/>
+                        <radio_item
+                                label="Custom Environment"
+                                layout="topleft"
+                                height="20"
+                                name="use_custom_setting"/>
+                    </radio_group>
+                    <button
+                            follows="top|left"
+                            height="23"
+                            label="Edit Custom"
+                            left_delta="30"
+                            bottom_delta="30"
+                            width="100"
+                            name="edit_btn"/>
+
+                </layout_panel>
+                <layout_panel 
+                        border="true"
+                        bevel_style="in"
+                        auto_resize="false"
+                        user_resize="true"
+                        height="11"
+                        width="220"
+                        background_visible="true">
+                    <text follows="top|left|right"
+                            halign="left"
+                            text_color="white">Day Settings</text>
+                    <text
+                            type="string"
+                            length="1"
+                            follows="left|top"
+                            height="12"
+                            layout="topleft"
+                            left_delta="10"
+                            top_pad="10"
+                            width="200">
+                        Day Length (hours)
+                    </text>
+                    <slider
+                            can_edit_text="true"
+                            control_name="DayLengthSLD"
+                            decimal_digits="1"
+                            follows="left|top"
+                            height="20"
+                            increment="0.5"
+                            initial_value="4"
+                            layout="topleft"
+                            left_delta="0"
+                            top_pad="6"
+                            name="day_length_sld"
+                            min_val="4"
+                            max_val="178"
+                            width="200" />
+                    <text
+                            type="string"
+                            length="1"
+                            follows="left|top"
+                            height="12"
+                            layout="topleft"
+                            left_delta="0"
+                            top_pad="10"
+                            width="200">
+                        Day Offset (hours)
+                    </text>
+                    <slider
+                            can_edit_text="true"
+                            control_name="DayOffsetSLD"
+                            decimal_digits="1"
+                            follows="left|top"
+                            height="20"
+                            increment="0.5"
+                            initial_value="-8"
+                            layout="topleft"
+                            left_delta="0"
+                            top_pad="6"
+                            name="day_offset_sld"
+                            min_val="-12"
+                            max_val="12"
+                            width="200" />
+
+                </layout_panel>
+                <layout_panel name="flex"
+                        auto_resize="true"
+                        user_resize="true"
+                        visible="false"
+                        bg_alpha_color="blue"
+                        height="100"
+                        background_visible="true">
+                </layout_panel>
+            </layout_stack>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                height="11"
+                min_height="0"
+                background_visible="false">
+    <check_box
+        control_name="may_override_chk"
+        height="16"
+        label="Parcel Owners May Override"
+        layout="topleft"
+        left="10"
+        top="10"
+        name="allow_override_chk"
+        width="200" />
+    <button
+        follows="bottom|left"
+        height="23"
+        label="Apply"
+        right="-160"
+        bottom="-30"
+        name="apply_btn"
+        width="100" />
+    <button
+        follows="bottom|left"
+        height="23"
+        label="Cancel"
+        layout="topleft"
+        left_pad="10"
+        name="cancel_btn"
+        width="100" /> 
+                
+        </layout_panel>
+    </layout_stack>
 </panel>
-- 
cgit v1.2.3


From 1b8c2b5ebbe0d42f147730bc9b6528fa8c6796ce Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 23 Jan 2018 08:54:34 -0800
Subject: MAINT-8052: Initial support for new EEP cap

---
 .../default/xui/en/panel_region_environment.xml    | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

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 a11b9b2d8b..21518338ff 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -10,8 +10,8 @@
     name="panel_env_info"
     width="530"> 
     <layout_stack 
-            left="0"
-            top="0"
+            left_offset="0"
+            top_offset="0"
             width="420"
             height="250"
             follows="left|right|top|bottom"
@@ -23,9 +23,9 @@
                 min_height="130"
                 background_visible="false">
             <layout_stack 
-                    left="5"
-                    top="5"
-                    right="-5"
+                    left_offset="5"
+                    top_offset="5"
+                    right_offset="-5"
                     follows="left|right|top|bottom"
                     orientation="horizontal">
                 <layout_panel 
@@ -59,11 +59,11 @@
                                 name="use_custom_setting"/>
                     </radio_group>
                     <button
-                            follows="top|left"
+                            follows="top|right"
                             height="23"
                             label="Edit Custom"
-                            left_delta="30"
-                            bottom_delta="30"
+                            right_offset="30"
+                            bottom_offset="30"
                             width="100"
                             name="edit_btn"/>
 
@@ -143,10 +143,10 @@
                 </layout_panel>
             </layout_stack>
         </layout_panel>
-        <layout_panel name="flex"
+        <layout_panel 
                 auto_resize="true"
                 user_resize="true"
-                height="11"
+                height="21"
                 min_height="0"
                 background_visible="false">
     <check_box
@@ -154,20 +154,20 @@
         height="16"
         label="Parcel Owners May Override"
         layout="topleft"
-        left="10"
-        top="10"
+        left_offset="10"
+        top_offset="10"
         name="allow_override_chk"
         width="200" />
     <button
-        follows="bottom|left"
+        follows="top|left"
         height="23"
         label="Apply"
-        right="-160"
-        bottom="-30"
+        left_offset="160"
+        top_offset="60"
         name="apply_btn"
         width="100" />
     <button
-        follows="bottom|left"
+        follows="top|left"
         height="23"
         label="Cancel"
         layout="topleft"
-- 
cgit v1.2.3


From 5e544ee35d70fa9e27774ba30ccae06aa6d4d5f9 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 23 Jan 2018 12:03:03 -0800
Subject: Adding a couple files that got skipped.

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  | 485 +++++++++++++++++++++
 1 file changed, 485 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
new file mode 100644
index 0000000000..d9a3ad0c4b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -0,0 +1,485 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="381"
+ layout="topleft"
+ name="Edit Day cycle"
+ help_topic="day_presets"
+ save_rect="true"
+ title="Edit Day Cycle"
+ width="705">
+
+    <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>
+    <string name="combo_label">-Select a preset-</string>
+
+    <text
+     follows="top|left|right"
+     height="10"
+     layout="topleft"
+     left="10"
+     name="hint"
+     top="25"
+     width="685" />
+    <text
+     follows="top|left|right"
+     font="SansSerif"
+     height="10"
+     layout="topleft"
+     left="10"
+     name="label"
+     top_pad="25"
+     width="120">
+     Preset Name:
+    </text>
+    <combo_box
+     allow_text_entry="true"
+     follows="top|left"
+     layout="topleft"
+     left_pad="10"
+     max_chars="100"
+     name="day_cycle_combo"
+     top_delta="-5"
+     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="95"
+     layout="topleft"
+     left_pad="10"
+     name="note"
+     top_delta="0"
+     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 ========-->
+    <text
+     follows="left|top|right"
+     height="10"
+     layout="topleft"
+     left="10"    
+     name="hint_item1"
+     top="100"
+     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="hint_item2"
+     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="hint_item3"
+     top_pad="10"
+     width="300">
+     - Use the scrubber to preview your day cycle.
+    </text>
+    <panel
+     follows="top|left"
+     height="100"
+     name="day_cycle_slider_panel"
+     layout="topleft"
+     left_delta="25"
+     top_pad="15"
+     width="660">
+        <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="WLCurKeyPresetText"
+     top_pad="10"
+     width="80">
+        Sky Setting:
+    </text>
+    <combo_box
+     height="18"
+     label="Preset"
+     layout="topleft"
+     left_pad="5"
+     name="WLSkyPresets"
+     width="205" />
+        <text
+     type="string"
+     length="1"
+     border_visible="true"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left_delta="-40"
+     name="WLCurKeyTimeText"
+     top_pad="15"
+     width="35">
+        Time:
+    </text>
+    <time
+     follows="left|top"
+     height="16"
+     label_width="0"
+     layout="topleft"
+     left_pad="3"
+     name="time"
+     top_delta="-1"
+     value="6:00 AM"
+     width="75"/> 
+    <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 536aeb54a6130f3d1e20405c8f6cbd29201de26d Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 23 Jan 2018 17:34:25 -0800
Subject: MAINT-8052: One more step towards parcel environments.

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  | 611 +++++----------------
 .../default/xui/en/floater_test_layout_stacks.xml  | 353 ++++++------
 2 files changed, 334 insertions(+), 630 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index d9a3ad0c4b..0f0acea832 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
- height="381"
- layout="topleft"
- name="Edit Day cycle"
- help_topic="day_presets"
- save_rect="true"
- title="Edit Day Cycle"
- width="705">
+        legacy_header_height="18"
+        height="500"
+        layout="topleft"
+        name="env_edit_extdaycycle"
+        help_topic="day_presets"
+        save_rect="true"
+        title="Edit Day Cycle"
+        width="705">
 
     <string name="title_new">Create a New Day Cycle</string>
     <string name="title_edit">Edit Day Cycle</string>
@@ -15,471 +15,130 @@
     <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"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="hint"
-     top="25"
-     width="685" />
-    <text
-     follows="top|left|right"
-     font="SansSerif"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="label"
-     top_pad="25"
-     width="120">
-     Preset Name:
-    </text>
-    <combo_box
-     allow_text_entry="true"
-     follows="top|left"
-     layout="topleft"
-     left_pad="10"
-     max_chars="100"
-     name="day_cycle_combo"
-     top_delta="-5"
-     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="95"
-     layout="topleft"
-     left_pad="10"
-     name="note"
-     top_delta="0"
-     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 ========-->
-    <text
-     follows="left|top|right"
-     height="10"
-     layout="topleft"
-     left="10"    
-     name="hint_item1"
-     top="100"
-     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="hint_item2"
-     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="hint_item3"
-     top_pad="10"
-     width="300">
-     - Use the scrubber to preview your day cycle.
-    </text>
-    <panel
-     follows="top|left"
-     height="100"
-     name="day_cycle_slider_panel"
-     layout="topleft"
-     left_delta="25"
-     top_pad="15"
-     width="660">
-        <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="WLCurKeyPresetText"
-     top_pad="10"
-     width="80">
-        Sky Setting:
-    </text>
-    <combo_box
-     height="18"
-     label="Preset"
-     layout="topleft"
-     left_pad="5"
-     name="WLSkyPresets"
-     width="205" />
-        <text
-     type="string"
-     length="1"
-     border_visible="true"
-     follows="left|top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left_delta="-40"
-     name="WLCurKeyTimeText"
-     top_pad="15"
-     width="35">
-        Time:
-    </text>
-    <time
-     follows="left|top"
-     height="16"
-     label_width="0"
-     layout="topleft"
-     left_pad="3"
-     name="time"
-     top_delta="-1"
-     value="6:00 AM"
-     width="75"/> 
-    <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>
+    <layout_stack name="test_stack"
+            width="705"
+            height="500"
+            follows="all"
+            orientation="vertical">
+        <layout_panel name="temp"
+                border="false"
+                auto_resize="false"
+                user_resize="true"
+                height="30"
+                min_height="30"
+                background_visible="false">
+            <!-- This layout_panel is for loading legacy presets -->
+            <text
+                    follows="top|left|right"
+                    font="SansSerif"
+                    height="10"
+                    layout="topleft"
+                    name="label"
+                    top_offset="20"
+                    left_offset="10"
+                    width="120">
+                Preset Name:
+            </text>
+            <combo_box
+                    allow_text_entry="true"
+                    follows="top|left"
+                    layout="topleft"
+                    left_pad="10"
+                    max_chars="100"
+                    name="day_cycle_preset_combo"
+                    top_delta="-5"
+                    width="200" />           
+        </layout_panel>
+        <layout_panel name="timeline"
+                border="true"
+                bevel_style="in"
+                auto_resize="false"
+                user_resize="true"
+                bg_alpha_color="red"
+                height="150"
+                min_height="0"
+                visible="true"
+                background_visible="true">
+            <text
+                    follows="top|left|right"
+                    font="SansSerif"
+                    height="10"
+                    layout="topleft"
+                    name="label"
+                    top_offset="20"
+                    left_offset="10"
+                    width="120">
+                Time Line Goes here
+            </text>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                bg_alpha_color="blue"
+                height="11"
+                min_height="0"
+                visible="true"
+                background_visible="true">
+            <tab_container
+                    follows="all"
+                    halign="left"
+                    height="386"
+                    layout="topleft"
+                    left_offset="0"
+                    name="landtab"
+                    tab_position="top"
+                    tab_width="140"
+                    tab_padding_right="3"
+                    top_offset="6"
+                    width="633">
+                <panel
+                        border="true"
+                        follows="all"
+                        label="DUMMY"
+                        layout="topleft"
+                        left="0"
+                        help_topic="land_general_tab"
+                        name="land_general_panel"
+                        top="0">
+            <text
+                    follows="top|left|right"
+                    font="SansSerif"
+                    height="10"
+                    layout="center"
+                    name="label"
+                    top_offset="20"
+                    left_offset="10"
+                    width="300">
+                Space For editing selected frame
+            </text>
+                        
+                </panel>
+            </tab_container>
+        </layout_panel>
+        <layout_panel name="buttons"
+                auto_resize="false"
+                user_resize="true"
+                height="43"
+                min_height="0"
+                background_visible="false">
+            <button
+                    follows="top|left"
+                    height="23"
+                    label="Save"
+                    left_offset="160"
+                    top_offset="60"
+                    name="save_btn"
+                    width="100" />
+            <button
+                    follows="top|left"
+                    height="23"
+                    label="Cancel"
+                    layout="topleft"
+                    left_pad="10"
+                    name="cancel_btn"
+                    width="100" /> 
+
+        </layout_panel>
+    </layout_stack>
+
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
index 82ad031959..a3ed22f422 100644
--- a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
@@ -10,172 +10,217 @@
         name="Test Floater"
         title="LAYOUTSTACK TESTS"
         width="420">
-    <layout_stack 
+    <layout_stack name="test_stack"
             left="0"
             top="0"
-            width="420"
+            width="100"
             height="250"
-            follows="left|right|top|bottom"
+            follows="left|top|bottom"
             orientation="vertical">
-        <layout_panel 
+        <layout_panel name="flex"
                 auto_resize="true"
                 user_resize="true"
-                bg_alpha_color="red"
-                max_height="200"
-                background_visible="false">
-            <layout_stack 
-                    left="5"
-                    top="5"
-                    right="-5"
-                    follows="left|right|top|bottom"
-                    orientation="horizontal">
-                <layout_panel 
-                        border="true"
-                        bevel_style="in"
-                        auto_resize="false"
-                        user_resize="false"
-                        width="160"
-                        background_visible="true">
-                    <text follows="top|left"
-                            halign="left"
-                            text_color="white">Environment Source</text>
-                    <radio_group
-                            follows="top|left"
-                            height="45"
-                            layout="topleft"
-                            left_delta="10"
-                            name="environment_select_radio_group"
-                            bottom_delta="50"
-                            max_width="200"
-                            width="200">
-                        <radio_item
-                                label="Default Environment"
-                                layout="topleft"
-                                name="use_default_setting"
-                                height="20"/>
-                        <radio_item
-                                label="Custom Environment"
-                                layout="topleft"
-                                height="20"
-                                name="use_custom_setting"/>
-                    </radio_group>
-                    <button
-                            follows="top|left"
-                            height="23"
-                            label="Edit Custom"
-                            left_delta="30"
-                            bottom_delta="30"
-                            width="100"
-                            name="edit_btn"/>
-
-                </layout_panel>
-                <layout_panel 
-                        border="true"
-                        bevel_style="in"
-                        auto_resize="false"
-                        user_resize="true"
-                        height="11"
-                        width="220"
-                        background_visible="true">
-                    <text follows="top|left|right"
-                            halign="left"
-                            text_color="white">Day Settings</text>
-                    <text
-                            type="string"
-                            length="1"
-                            follows="left|top"
-                            height="12"
-                            layout="topleft"
-                            left_delta="10"
-                            top_pad="10"
-                            width="200">
-                        Day Length (hours)
-                    </text>
-                    <slider
-                            can_edit_text="true"
-                            control_name="DayLengthSLD"
-                            decimal_digits="1"
-                            follows="left|top"
-                            height="20"
-                            increment="0.5"
-                            initial_value="4"
-                            layout="topleft"
-                            left_delta="0"
-                            top_pad="6"
-                            name="day_length_sld"
-                            min_val="4"
-                            max_val="178"
-                            width="200" />
-                    <text
-                            type="string"
-                            length="1"
-                            follows="left|top"
-                            height="12"
-                            layout="topleft"
-                            left_delta="0"
-                            top_pad="10"
-                            width="200">
-                        Day Offset (hours)
-                    </text>
-                    <slider
-                            can_edit_text="true"
-                            control_name="DayOffsetSLD"
-                            decimal_digits="1"
-                            follows="left|top"
-                            height="20"
-                            increment="0.5"
-                            initial_value="-8"
-                            layout="topleft"
-                            left_delta="0"
-                            top_pad="6"
-                            name="day_offset_sld"
-                            min_val="-12"
-                            max_val="12"
-                            width="200" />
-
-                </layout_panel>
-                <layout_panel name="flex"
-                        auto_resize="true"
-                        user_resize="true"
-                        visible="false"
-                        bg_alpha_color="blue"
-                        height="100"
-                        background_visible="true">
-                </layout_panel>
-            </layout_stack>
+                bg_alpha_color="blue"
+                height="11"
+                min_height="0"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
         <layout_panel name="flex"
                 auto_resize="true"
                 user_resize="true"
+                bg_alpha_color="blue"
                 height="11"
                 min_height="0"
-                background_visible="false">
-    <check_box
-        control_name="may_override_chk"
-        height="16"
-        label="Parcel Owners May Override"
-        layout="topleft"
-        left="10"
-        top="10"
-        name="allow_override_chk"
-        width="200" />
-    <button
-        follows="bottom|left"
-        height="23"
-        label="Apply"
-        right="-160"
-        bottom="-30"
-        name="apply_btn"
-        width="100" />
-    <button
-        follows="bottom|left"
-        height="23"
-        label="Cancel"
-        layout="topleft"
-        left_pad="10"
-        name="cancel_btn"
-        width="100" /> 
-                
+                visible="false"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                bg_alpha_color="blue"
+                height="11"
+                min_height="0"
+                visible="true"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                bg_alpha_color="blue"
+                height="11"
+                min_height="0"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
+        </layout_panel>
+    </layout_stack>
+    <layout_stack name="test_stack"
+            left_pad="5"
+            top="0"
+            width="100"
+            height="250"
+            follows="left|top|bottom"
+            orientation="vertical">
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                bg_alpha_color="blue"
+                height="100"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                visible="false"
+                bg_alpha_color="blue"
+                height="100"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
+        </layout_panel>
+        <layout_panel name="fixed"
+                auto_resize="false"
+                user_resize="true"
+                height="50"
+                min_height="10"
+                bg_alpha_color="green"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="black">fixed</text>
+        </layout_panel>
+        <layout_panel name="fixed"
+                auto_resize="false"
+                user_resize="true"
+                height="50"
+                min_height="10"
+                bg_alpha_color="green"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="black">fixed</text>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                bg_alpha_color="blue"
+                height="100"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                bg_alpha_color="blue"
+                height="100"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                bg_alpha_color="blue"
+                height="100"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                bg_alpha_color="blue"
+                height="100"
+                visible="true"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
+        </layout_panel>
+    </layout_stack>
+    <layout_stack name="test_stack"
+            left_pad="5"
+            top="0"
+            width="100"
+            height="250"
+            follows="left|top|bottom"
+            orientation="vertical">
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                height="11"
+                bg_alpha_color="blue"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
+        </layout_panel>
+        <layout_panel name="fixed"
+                auto_resize="false"
+                user_resize="true"
+                height="50"
+                bg_alpha_color="green"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="black">fixed</text>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                bg_alpha_color="blue"
+                height="11"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
+        </layout_panel>
+    </layout_stack>
+    <layout_stack name="test_stack"
+            left_pad="5"
+            top="0"
+            width="100"
+            height="250"
+            follows="left|top|bottom"
+            orientation="vertical">
+        <layout_panel name="fixed"
+                auto_resize="false"
+                user_resize="true"
+                height="50"
+                bg_alpha_color="green"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="black">fixed</text>
+        </layout_panel>
+        <layout_panel name="fixed"
+                auto_resize="false"
+                user_resize="true"
+                height="50"
+                bg_alpha_color="green"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="black">fixed</text>
+        </layout_panel>
+        <layout_panel name="fixed"
+                auto_resize="false"
+                user_resize="true"
+                height="50"
+                bg_alpha_color="green"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="black">fixed</text>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                bg_alpha_color="blue"
+                height="11"
+                min_height="0"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                bg_alpha_color="blue"
+                height="11"
+                min_height="0"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
+        </layout_panel>
+        <layout_panel name="flex"
+                auto_resize="true"
+                user_resize="true"
+                bg_alpha_color="blue"
+                height="11"
+                min_height="0"
+                background_visible="true">
+            <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
     </layout_stack>
 </floater>
-- 
cgit v1.2.3


From b766466b3013e39831bcfcaef5d1089c07202afb Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 26 Feb 2018 09:27:14 -0800
Subject: Added settings inventory object with subtype

---
 .../skins/default/xui/en/floater_edit_ext_day_cycle.xml  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 0f0acea832..88423ad023 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -24,8 +24,8 @@
                 border="false"
                 auto_resize="false"
                 user_resize="true"
-                height="30"
-                min_height="30"
+                height="45"
+                min_height="45"
                 background_visible="false">
             <!-- This layout_panel is for loading legacy presets -->
             <text
@@ -34,8 +34,7 @@
                     height="10"
                     layout="topleft"
                     name="label"
-                    top_offset="20"
-                    left_offset="10"
+                    top_delta="70"
                     width="120">
                 Preset Name:
             </text>
@@ -138,6 +137,15 @@
                     name="cancel_btn"
                     width="100" /> 
 
+            <button
+                    follows="top|right"
+                    height="23"
+                    label="Upload"
+                    layout="topleft"
+                    left_pad="10"
+                    name="upload_btn"
+                    width="100" /> 
+                    
         </layout_panel>
     </layout_stack>
 
-- 
cgit v1.2.3


From cf0e4f79f52b4fb24769aa6e355ec8c95c6d2afc Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 27 Apr 2018 17:12:13 -0700
Subject: Adding fixed water edit dialog.

---
 .../default/xui/en/floater_fixedenvironment.xml    | 114 ++++++
 .../skins/default/xui/en/panel_settings_water.xml  | 399 +++++++++++++++++++++
 2 files changed, 513 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_settings_water.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
new file mode 100644
index 0000000000..03bbc05dad
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+        can_minimize="false"
+        can_tear_off="false"
+        can_resize="true"
+        can_drag_on_left="false"
+        can_close="true"
+        can_dock="true"
+        bevel_style="in"
+        height="500"
+        layout="topleft"
+        name="Fixed Environment"
+        save_rect="true"
+        title="Fixed Environment"
+        save_dock_state="true"
+        save_visibility="true"
+        single_instance="true" 
+        width="650">
+    <layout_stack name="floater_stack"
+            left="5"
+            top="5"
+            right="-5"
+            bottom="-5"
+            follows="left|top|right|bottom"
+            orientation="vertical">
+        <layout_panel name="info_panel"
+                auto_resize="false"
+                user_resize="false"
+                bg_alpha_color="blue"
+                min_height="60">
+            <text
+                    follows="left|top"
+                    top_delta="30"
+                    left_delta="10"
+                    width="35"
+                    height="20"
+                    font="SansSerif">
+            Name:
+            </text>
+            <line_editor
+                    follows="left|top"
+                    top_delta="-2"
+                    left_delta="45"
+                    width="250"
+                    name="settings_name"
+                    max_length_chars="32"
+                    height="20"/>
+            <button
+                    height="23"
+                    label="Load"
+                    follows="left|top"
+                    left_delta="260"
+                    font="SansSerif"
+                    top_delta="-2"
+                    name="btn_load"
+                    tool_tip="Load a settings from inventory" 
+                    width="96" />
+            <button
+                    height="23"
+                    label="Import"
+                    follows="right|top"
+                    right="-10"
+                    font="SansSerif"
+                    top_delta="0"
+                    name="btn_import"
+                    tool_tip="Import legacy settings from disk." 
+                    width="96" />
+        </layout_panel>
+        <layout_panel name="tab_area"
+                auto_resize="true"
+                user_resize="true"
+                height="11"
+                min_height="0"
+                visible="true">
+            <tab_container
+                    follows="all"
+                    halign="left"
+                    layout="topleft"
+                    left="0"
+                    name="tab_settings"
+                    tab_position="top"
+                    tab_width="120"
+                    tab_padding_right="3">
+                <!-- move to own file -->
+            </tab_container>
+        </layout_panel>
+        <layout_panel name="button_panel"
+                follows="left|top|right|bottom"
+                auto_resize="false"
+                user_resize="false"
+                height="40"
+                visible="true">
+            <button
+                    height="23"
+                    label="Save"
+                    follows="left|top"
+                    font="SansSerif"
+                    name="btn_commit"
+                    tool_tip="Load a settings from inventory" 
+                    width="96" />
+            <button
+                    height="23"
+                    label="Cancel"
+                    follows="right|top"
+                    right="-10"
+                    top_delta="0"
+                    font="SansSerif"
+                    name="btn_cancel"
+                    tool_tip="Load a settings from inventory" 
+                    width="96" />
+
+        </layout_panel>
+    </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
new file mode 100644
index 0000000000..fe088d98cf
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+        border="true"
+        follows="all"
+        label="Water"
+        layout="topleft"
+        left="0"
+        help_topic="land_general_tab"
+        name="panel_settings_water"
+        top="0">
+    <layout_stack name="water_stack1"
+            left="5"
+            top="5"
+            right="-5"
+            bottom="-5"
+            follows="left|top|right|bottom"
+            orientation="vertical">
+        <layout_panel
+                border="true"
+                bevel_style="in"
+                auto_resize="false"
+                user_resize="false"
+                visible="true"
+                height="105">
+            <text
+                    follows="left|top"
+                    height="20"
+                    font="SansSerif"
+                    layout="topleft"
+                    left="5"
+                    top="5"
+                    width="215">
+                Water Fog:
+            </text>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="left|top"
+                    left_delta="15"
+                    top_delta="0"
+                    width="60">
+                Color:
+            </text>
+            <color_swatch
+                    can_apply_immediately="true"
+                    follows="left|top"
+                    height="37"
+                    label_height="0"
+                    layout="topleft"
+                    left_delta="0"
+                    name="water_fog_color"
+                    top_pad="5"
+                    width="60" />
+            <text
+                    follows="left|top"
+                    height="10"
+                    top_delta="-15"
+                    left_delta="80"
+                    width="200">
+                Density Exponent:
+            </text>
+            <slider
+                    decimal_digits="1"
+                    follows="left|top|right"
+                    height="10"
+                    initial_value="0"
+                    layout="top"
+                    left_delta="15"
+                    max_val="10"
+                    name="water_fog_density"
+                    top_delta="5"
+                    width="200"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    top_delta="25"
+                    left_delta="-15"
+                    width="200">
+                Underwater Modifier:</text>
+            <slider
+                    decimal_digits="1"
+                    follows="left|top|right"
+                    height="10"
+                    initial_value="0"
+                    layout="top"
+                    left_delta="15"
+                    max_val="10"
+                    name="water_underwater_mod"
+                    top_delta="20"
+                    width="200"/>
+        </layout_panel>
+        <layout_panel
+                auto_resize="true"
+                user_resize="true"
+                visible="true">
+            <layout_stack name="water_stack2"
+                    left="5"
+                    top="5"
+                    right="-5"
+                    bottom="-5"
+                    follows="left|top|right|bottom"
+                    orientation="horizontal">
+                <layout_panel
+                        border="true"
+                        bevel_style="in"
+                        auto_resize="true"
+                        user_resize="true"
+                        visible="true"
+                        min_width="375"
+                        width="50">
+                    <text
+                            follows="left|top"
+                            height="20"
+                            font="SansSerif"
+                            layout="topleft"
+                            left="5"
+                            top="5"
+                            width="215">
+                        Waves:
+                    </text>
+                    <text
+                            follows="left|top|right"
+                            height="16"
+                            layout="topleft"
+                            left="15"
+                            top_delta="20"
+                            width="215">
+                        Normal Map
+                    </text>
+                    <texture_picker
+                            height="100"
+                            layout="topleft"
+                            left_delta="0"
+                            name="water_normal_map"
+                            top_pad="5"
+                            width="100"/>
+
+                    <text
+                            follows="left|top"
+                            height="16"
+                            layout="topleft"
+                            top_delta="-20"
+                            left_delta="120">
+                        Large Wave Speed
+                    </text>
+                    <panel
+                            follows="left|top"
+                            border="true"
+                            bg_alpha_color="red"
+                            background_visible="true"
+                            width="100"
+                            height="100"
+                            left_delta="0"
+                            top_delta="21">
+                        <text>
+                            placeholder
+                        </text>
+                        <slider
+                                decimal_digits="1"
+                                follows="left|top"
+                                initial_value="0"
+                                layout="topleft"
+                                label="X:"
+                                left_delta="10"
+                                max_val="4"
+                                min_val="-4"
+                                name="water_wave1_x"
+                                top_pad="5"
+                                width="100"/>
+                        <slider
+                                decimal_digits="1"
+                                follows="left|top"
+                                initial_value="0"
+                                layout="topleft"
+                                label="Y:"
+                                left_delta="0"
+                                max_val="4"
+                                min_val="-4"
+                                name="water_wave1_y"
+                                top_pad="5"
+                                orientation="vertical" 
+                                height="70"/>
+                    </panel>
+                    <text
+                            follows="left|top"
+                            height="16"
+                            layout="topleft"
+                            top_delta="-20"
+                            left_delta="120">
+                        Small Wave Speed
+                    </text>
+                    <panel
+                            follows="left|top"
+                            border="true"
+                            bg_alpha_color="red"
+                            background_visible="true"
+                            width="100"
+                            height="100"
+                            left_delta="0"
+                            top_delta="21"
+                            >
+                        <text>
+                            placeholder
+                        </text>
+                        <slider
+                                decimal_digits="1"
+                                follows="left|top"
+                                initial_value="0"
+                                layout="topleft"
+                                label="X:"
+                                left_delta="10"
+                                max_val="4"
+                                min_val="-4"
+                                name="water_wave2_x"
+                                top_pad="5"
+                                width="100"/>
+                        <slider
+                                decimal_digits="1"
+                                follows="left|top"
+                                initial_value="0"
+                                layout="topleft"
+                                label="Y:"
+                                left_delta="0"
+                                max_val="4"
+                                min_val="-4"
+                                name="water_wave2_y"
+                                top_pad="5"
+                                orientation="vertical" 
+                                height="70"/>
+                    </panel>
+
+                    <text
+                            follows="left|top|right"
+                            height="16"
+                            layout="topleft"
+                            left="15"
+                            top_pad="10"
+                            width="215">
+                        Reflection Wavelet Scale
+                    </text>
+                    <slider
+                            decimal_digits="1"
+                            follows="left|top"
+                            initial_value="0.7"
+                            layout="topleft"
+                            label="X:"
+                            left_delta="10"
+                            max_val="10"
+                            name="water_normal_scale_x"
+                            top_pad="5"
+                            width="150"/>
+                    <slider
+                            decimal_digits="1"
+                            follows="left|top"
+                            initial_value="0.7"
+                            layout="topleft"
+                            max_val="10"
+                            name="water_normal_scale_y"
+                            top_pad="6"
+                            label="Y:"
+                            width="150"/>
+                    <slider
+                            decimal_digits="1"
+                            follows="left|top"
+                            initial_value="0.7"
+                            layout="topleft"
+                            max_val="10"
+                            name="water_normal_scale_z"
+                            top_pad="6"
+                            label="Z:"
+                            width="150"/>
+
+                    <text
+                            follows="left|top|right"
+                            height="16"
+                            layout="topleft"
+                            left_delta="175"
+                            top_delta="-52"
+                            width="150">
+                        Fresnel Scale:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="10"
+                            increment="0.01"
+                            initial_value="0.7"
+                            layout="topleft"
+                            left_delta="5"
+                            name="water_fresnel_scale"
+                            top_pad="5"
+                            width="150"/>
+                    <text
+                            follows="left|top|right"
+                            layout="topleft"
+                            left_delta="-5"
+                            name="FresnelOffsetText"
+                            top_pad="10"
+                            width="150">
+                        Fresnel Offset:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top|right"
+                            increment="0.01"
+                            initial_value="0.7"
+                            layout="topleft"
+                            left_delta="5"
+                            name="water_fresnel_offset"
+                            top_pad="5"
+                            width="150"/>
+                </layout_panel>
+                <layout_panel
+                        border="true"
+                        bevel_style="in"
+                        auto_resize="true"
+                        user_resize="true"
+                        width="50"
+                        visible="true">
+                    <text
+                            follows="left|top"
+                            height="20"
+                            font="SansSerif"
+                            layout="topleft"
+                            left="5"
+                            top="5"
+                            width="215">
+                        Refraction And Blur:
+                    </text>
+                    <text
+                            follows="left|top|right"
+                            height="16"
+                            layout="topleft"
+                            top_delta="25"
+                            left_delta="5"
+                            width="215">
+                        Refraction Scale (Above)
+                    </text>
+                    <slider
+                            control_name="water_scale_above"
+                            decimal_digits="2"
+                            follows="left|top"
+                            increment="0.01"
+                            initial_value="0.1"
+                            layout="topleft"
+                            left_delta="5"
+                            name="water_scale_above"
+                            top_pad="5"
+                            width="200" />
+                    <text
+                            type="string"
+                            length="1"
+                            follows="left|top|right"
+                            height="16"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_pad="15"
+                            width="215">
+                        Refraction Scale (Below)
+                    </text>
+                    <slider
+                            control_name="water_scale_below"
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="10"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            name="water_scale_below"
+                            top_pad="5"
+                            width="200"/>
+                    <text
+                            follows="left|top|right"
+                            font="SansSerif"
+                            height="16"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_pad="5"
+                            width="215">
+                        Blur Multiplier
+                    </text>
+                    <slider
+                            control_name="water_blur_multip"
+                            follows="left|top"
+                            height="10"
+                            increment="0.001"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            max_val="0.16"
+                            name="water_blur_multip"
+                            top_pad="5"
+                            width="200"/>
+                </layout_panel>
+            </layout_stack>
+        </layout_panel>
+    </layout_stack>
+</panel>     
-- 
cgit v1.2.3


From 03da2bc1a1c7674514c967b0e7408258dba25d77 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 2 May 2018 17:07:06 -0700
Subject: Fixed sky editing floater.

---
 .../default/xui/en/floater_fixedenvironment.xml    |   7 +-
 .../default/xui/en/panel_settings_sky_atmos.xml    | 240 +++++++++++++++++++
 .../default/xui/en/panel_settings_sky_clouds.xml   | 255 +++++++++++++++++++++
 .../default/xui/en/panel_settings_sky_sunmoon.xml  | 234 +++++++++++++++++++
 4 files changed, 734 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index 03bbc05dad..2590bb3410 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -26,7 +26,6 @@
         <layout_panel name="info_panel"
                 auto_resize="false"
                 user_resize="false"
-                bg_alpha_color="blue"
                 min_height="60">
             <text
                     follows="left|top"
@@ -81,7 +80,11 @@
                     tab_position="top"
                     tab_width="120"
                     tab_padding_right="3">
-                <!-- move to own file -->
+                <!-- Tabs inserted here in code -->
+                <!-- -->
+                <!-- -->
+                
+                <!-- -->
             </tab_container>
         </layout_panel>
         <layout_panel name="button_panel"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
new file mode 100644
index 0000000000..643994b6b1
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+        border="true"
+        follows="all"
+        label="Atmosphere &amp; Lighting"
+        layout="topleft"
+        left="0"
+        name="panel_settings_sky_atmos"
+        top="0">
+    <layout_stack 
+            left="5"
+            top="5"
+            right="-5"
+            bottom="-5"
+            follows="left|top|right|bottom"
+            orientation="vertical">
+        <layout_panel
+                border="true"
+                bevel_style="in"
+                auto_resize="false"
+                user_resize="false"
+                visible="true"
+                height="75">
+
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="15"
+                    top_pad="15"
+                    width="80">
+                Ambient Color:
+            </text>
+            <color_swatch
+                    can_apply_immediately="true"
+                    follows="left|top"
+                    height="37"
+                    label_height="0"
+                    layout="topleft"
+                    left_delta="0"
+                    name="ambient_light"
+                    top_pad="5"
+                    width="60" />
+            <text
+                    follows="left"
+                    height="10"
+                    layout="topleft"
+                    left_delta="90"
+                    top_delta="-15"
+                    width="80">
+                Blue Horizon:
+            </text>
+            <color_swatch
+                    can_apply_immediately="true"
+                    follows="left|top"
+                    height="37"
+                    label_height="0"
+                    layout="topleft"
+                    left_delta="0"
+                    name="blue_horizon"
+                    top_pad="5"
+                    width="60" />
+            <text
+                    follows="left"
+                    height="10"
+                    layout="topleft"
+                    left_delta="90"
+                    top_delta="-15"
+                    width="80">
+                Blue Density:
+            </text>
+            <color_swatch
+                    can_apply_immediately="true"
+                    follows="left|top"
+                    height="37"
+                    label_height="0"
+                    layout="topleft"
+                    left_delta="0"
+                    name="blue_density"
+                    top_pad="5"
+                    width="60" />
+        </layout_panel>
+        <layout_panel
+                border="true"
+                bevel_style="in"
+                auto_resize="true"
+                user_resize="true"
+                visible="true">
+            <layout_stack name="atmosphere1"
+                    left="5"
+                    top="5"
+                    right="-5"
+                    bottom="-5"
+                    follows="left|top|right|bottom"
+                    orientation="hoizontal">
+                <layout_panel
+                        border="false"
+                        bevel_style="in"
+                        auto_resize="true"
+                        user_resize="true"
+                        visible="true"
+                        min_width="225">
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="15"
+                            top_pad="15"
+                            width="80">
+                        Haze Horizon:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="10"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="1"
+                            name="haze_horizon"
+                            top_delta="20"
+                            width="200"/>
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_delta="25"
+                            width="80">
+                        Haze Density:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="10"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="1"
+                            name="haze_density"
+                            top_delta="20"
+                            width="200"/>
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_delta="25"
+                            width="80">
+                        Scene Gamma:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="10"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            max_val="10"
+                            name="scene_gamma"
+                            top_delta="20"
+                            width="207"/>
+                </layout_panel>            
+                <layout_panel
+                        border="false"
+                        bevel_style="in"
+                        auto_resize="true"
+                        user_resize="true"
+                        visible="true"
+                        min_width="225">
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="15"
+                            top_pad="15"
+                            width="200">
+                        Density Multiplier:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="10"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="0.9"
+                            name="density_multip"
+                            top_delta="20"
+                            width="200"/>
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_delta="25"
+                            width="200">
+                        Distance Multiplier:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="10"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="100"
+                            name="distance_multip"
+                            top_delta="20"
+                            width="214"/>
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_delta="25"
+                            width="200">
+                        Maximum Altitude:
+                    </text>
+                    <slider
+                            decimal_digits="1"
+                            follows="left|top"
+                            height="10"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="4000"
+                            name="max_alt"
+                            top_delta="20"
+                            width="214"/>
+                </layout_panel>            
+            </layout_stack>                
+        </layout_panel>
+    </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
new file mode 100644
index 0000000000..2a52f1a96e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+        border="true"
+        follows="all"
+        label="Clouds"
+        layout="topleft"
+        left="0"
+        help_topic="land_general_tab"
+        name="panel_settings_sky_clouds"
+        top="0">
+    <layout_stack 
+            left="5"
+            top="5"
+            right="-5"
+            bottom="-5"
+            follows="left|top|right|bottom"
+            orientation="hoizontal">
+        <layout_panel
+                border="true"
+                bevel_style="in"
+                auto_resize="true"
+                user_resize="true"
+                visible="true"
+                height="75">
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="15"
+                    top_pad="15"
+                    width="80">
+                Cloud Color:
+            </text>
+            <color_swatch
+                    can_apply_immediately="true"
+                    follows="left|top"
+                    height="37"
+                    label_height="0"
+                    layout="topleft"
+                    left_delta="0"
+                    name="cloud_color"
+                    top_pad="5"
+                    width="60" />
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="0"
+                    top_delta="47"
+                    width="200">
+                Cloud Coverage:
+            </text>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="10"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_coverage"
+                    top_delta="20"
+                    width="214"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="-5"
+                    top_delta="25"
+                    width="200">
+                Cloud Scale:
+            </text>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="10"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_scale"
+                    top_delta="20"
+                    width="214"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="-5"
+                    top_delta="25"
+                    width="200">
+                Cloud Scroll:
+            </text>
+            <panel
+                    follows="left|top"
+                    border="true"
+                    bg_alpha_color="red"
+                    background_visible="true"
+                    width="100"
+                    height="100"
+                    left_delta="5"
+                    top_delta="21">
+                <text>
+                    placeholder
+                </text>
+                <slider
+                        decimal_digits="1"
+                        follows="left|top"
+                        initial_value="0"
+                        layout="topleft"
+                        label="X:"
+                        left_delta="10"
+                        max_val="10"
+                        min_val="-10"
+                        name="cloud_scroll_x"
+                        top_pad="5"
+                        width="100"/>
+                <slider
+                        decimal_digits="1"
+                        follows="left|top"
+                        initial_value="0"
+                        layout="topleft"
+                        label="Y:"
+                        left_delta="0"
+                        max_val="10"
+                        min_val="-10"
+                        name="cloud_scroll_y"
+                        top_pad="5"
+                        orientation="vertical" 
+                        height="70"/>
+            </panel>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="115"
+                    top_delta="-20"
+                    width="200">
+                Cloud Image:
+            </text>
+            <texture_picker
+                    height="100"
+                    layout="topleft"
+                    left_delta="5"
+                    name="cloud_map"
+                    top_pad="10"
+                    width="100"/>
+        </layout_panel>
+        <layout_panel
+                border="true"
+                bevel_style="in"
+                auto_resize="true"
+                user_resize="true"
+                visible="true"
+                height="75">
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="15"
+                    top_pad="15"
+                    width="200">
+                Cloud Density:
+            </text>
+            <slider
+                    label="X"
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="10"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_density_x"
+                    top_delta="20"
+                    width="200"/>
+            <slider
+                    label="Y"
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="10"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="0"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_density_y"
+                    top_delta="20"
+                    width="200"/>
+            <slider
+                    label="D"
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="10"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="0"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_density_d"
+                    top_delta="20"
+                    width="200"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="-5"
+                    top_delta="35"
+                    width="200">
+                Cloud Detail:
+            </text>
+            <slider
+                    label="X"
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="10"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_detail_x"
+                    top_delta="20"
+                    width="200"/>
+            <slider
+                    label="Y"
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="10"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="0"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_detail_y"
+                    top_delta="20"
+                    width="200"/>
+            <slider
+                    label="D"
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="10"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="0"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_detail_d"
+                    top_delta="20"
+                    width="200"/>
+        </layout_panel>
+    </layout_stack>
+</panel>                
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
new file mode 100644
index 0000000000..c0bd123fbc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+        border="true"
+        follows="all"
+        label="Sun &amp; Moon"
+        layout="topleft"
+        left="0"
+        name="panel_settings_sky_hbodies"
+        top="0">
+    <layout_stack 
+            left="5"
+            top="5"
+            right="-5"
+            bottom="-5"
+            follows="left|top|right|bottom"
+            orientation="hoizontal">
+        <layout_panel
+                border="true"
+                bevel_style="in"
+                auto_resize="true"
+                user_resize="true"
+                visible="true"
+                height="75">
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="15"
+                    top_pad="15"
+                    width="80">
+                Sun Color:
+            </text>
+            <color_swatch
+                    can_apply_immediately="true"
+                    follows="left|top"
+                    height="37"
+                    label_height="0"
+                    layout="topleft"
+                    left_delta="0"
+                    name="sun_moon_color"
+                    top_pad="5"
+                    width="60" />
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="0"
+                    top_delta="57"
+                    width="200">
+                Glow Focus:
+            </text>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="10"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0"
+                    max_val="0.5"
+                    name="glow_focus"
+                    top_delta="20"
+                    width="200"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="-5"
+                    top_delta="20"
+                    width="200">
+                Glow Size:
+            </text>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="10"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="1"
+                    max_val="1.99"
+                    name="glow_size"
+                    top_delta="20"
+                    width="200"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="-5"
+                    top_delta="30"
+                    width="200">
+                Star Brightness:
+            </text>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="10"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0"
+                    max_val="2"
+                    name="star_brightness"
+                    top_delta="20"
+                    width="200"/>
+        </layout_panel>
+        <layout_panel
+                border="false"
+                bevel_style="in"
+                auto_resize="true"
+                user_resize="true"
+                visible="true"
+                height="75">
+            <layout_stack 
+                    left="5"
+                    top="5"
+                    right="-5"
+                    bottom="-5"
+                    follows="left|top|right|bottom"
+                    orientation="vertical">
+                <layout_panel
+                        border="true"
+                        bevel_style="in"
+                        auto_resize="true"
+                        user_resize="true"
+                        visible="true"
+                        height="75">
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="15"
+                            top_pad="15"
+                            font="SansSerifBold"
+                            width="80">
+                        Sun
+                    </text>
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="10"
+                            top_delta="30"
+                            width="100">
+                        Position:
+                    </text>
+                    <joystick_quat
+                            follows="left|top"
+                            height="78"
+                            layout="topleft"
+                            left_delta="0"
+                            top_delta="20"
+                            name="sun_rotation"
+                            quadrant="left"
+                            sound_flags="3"
+                            visible="true"
+                            tool_tip="Move sun in sky"
+                            width="78" /> <!-- Should be 126x126 -->
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="100"
+                            top_delta="-20"
+                            width="200">
+                        Image:
+                    </text>
+                    <texture_picker
+                            height="100"
+                            layout="topleft"
+                            left_delta="5"
+                            name="sun_image"
+                            top_pad="10"
+                            width="100"/>
+                </layout_panel>
+                <layout_panel
+                        border="true"
+                        bevel_style="in"
+                        auto_resize="true"
+                        user_resize="true"
+                        visible="true"
+                        height="75">
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="15"
+                            top_pad="15"
+                            font="SansSerifBold"
+                            width="80">
+                        Moon
+                    </text>
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="10"
+                            top_delta="30"
+                            width="100">
+                        Position:
+                    </text>
+                    <joystick_quat
+                            follows="left|top"
+                            height="78"
+                            layout="topleft"
+                            left_delta="0"
+                            top_delta="20"
+                            name="moon_rotation"
+                            quadrant="left"
+                            sound_flags="3"
+                            visible="true"
+                            tool_tip="Move sun in sky"
+                            width="78" /> <!-- Should be 126x126 -->
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="100"
+                            top_delta="-20"
+                            width="200">
+                        Image:
+                    </text>
+                    <texture_picker
+                            height="100"
+                            layout="topleft"
+                            left_delta="5"
+                            name="moon_image"
+                            top_pad="10"
+                            width="100"/>
+                </layout_panel>
+            </layout_stack>
+        </layout_panel>
+    </layout_stack>
+</panel>                
-- 
cgit v1.2.3


From 3e33fc9130cdd5dc63cc6cc7b9f0e38b6e552f12 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 3 May 2018 14:59:29 -0700
Subject: Inventory context menus and increment attrib for settings panels.

---
 .../skins/default/xui/en/menu_inventory.xml        | 29 ++++++++++++++++++++++
 .../skins/default/xui/en/menu_inventory_add.xml    | 29 ++++++++++++++++++++++
 .../default/xui/en/panel_settings_sky_atmos.xml    |  6 +++++
 .../default/xui/en/panel_settings_sky_clouds.xml   | 10 ++++++++
 .../default/xui/en/panel_settings_sky_sunmoon.xml  |  3 +++
 .../skins/default/xui/en/panel_settings_water.xml  |  9 +++++++
 indra/newview/skins/default/xui/en/strings.xml     |  5 ++++
 7 files changed, 91 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 5b45364127..29915788f1 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -321,6 +321,35 @@
              parameter="eyes" />
         </menu_item_call>
     </menu>
+    <menu
+     label="New Settings"
+     layout="topleft"
+     name="New Settings">
+        <menu_item_call
+         label="New Sky"
+         layout="topleft"
+         name="New Sky">
+            <menu_item_call.on_click
+             function="Inventory.DoCreate"
+             parameter="sky"/>
+        </menu_item_call>
+        <menu_item_call
+         label="New Water"
+         layout="topleft"
+         name="New Water">
+            <menu_item_call.on_click
+             function="Inventory.DoCreate"
+             parameter="water"/>
+        </menu_item_call>
+        <menu_item_call
+         label="New Day Cycle"
+         layout="topleft"
+         name="New Day Cycle">
+            <menu_item_call.on_click
+             function="Inventory.DoCreate"
+             parameter="daycycle"/>
+        </menu_item_call>
+    </menu>
     <menu
      label="Use as default for"
      layout="topleft"
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 afeb1bf226..7c31bfe54d 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -245,4 +245,33 @@
                      parameter="eyes" />
                 </menu_item_call>
             </menu>
+            <menu
+             label="New Settings"
+             layout="topleft"
+             name="New Settings">
+                <menu_item_call
+                 label="New Sky"
+                 layout="topleft"
+                 name="New Sky">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="sky"/>
+                </menu_item_call>
+                <menu_item_call
+                 label="New Water"
+                 layout="topleft"
+                 name="New Water">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="water"/>
+                </menu_item_call>
+                <menu_item_call
+                 label="New Day Cycle"
+                 layout="topleft"
+                 name="New Day Cycle">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="daycycle"/>
+                </menu_item_call>
+            </menu>
 </menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 643994b6b1..ffa7df209b 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -113,6 +113,7 @@
                             decimal_digits="2"
                             follows="left|top"
                             height="10"
+                            increment="0.01"
                             initial_value="0"
                             layout="topleft"
                             left_delta="5"
@@ -134,6 +135,7 @@
                             decimal_digits="2"
                             follows="left|top"
                             height="10"
+                            increment="0.01"
                             initial_value="0"
                             layout="topleft"
                             left_delta="5"
@@ -155,6 +157,7 @@
                             decimal_digits="2"
                             follows="left|top"
                             height="10"
+                            increment="0.01"
                             initial_value="0"
                             layout="topleft"
                             left_delta="5"
@@ -183,6 +186,7 @@
                             decimal_digits="2"
                             follows="left|top"
                             height="10"
+                            increment="0.01"
                             initial_value="0"
                             layout="topleft"
                             left_delta="5"
@@ -204,6 +208,7 @@
                             decimal_digits="2"
                             follows="left|top"
                             height="10"
+                            increment="0.01"
                             initial_value="0"
                             layout="topleft"
                             left_delta="5"
@@ -225,6 +230,7 @@
                             decimal_digits="1"
                             follows="left|top"
                             height="10"
+                            increment="0.01"
                             initial_value="0"
                             layout="topleft"
                             left_delta="5"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 2a52f1a96e..b88ac64323 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -54,6 +54,7 @@
                     decimal_digits="2"
                     follows="left|top"
                     height="10"
+                    increment="0.01"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
@@ -75,6 +76,7 @@
                     decimal_digits="2"
                     follows="left|top"
                     height="10"
+                    increment="0.01"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
@@ -107,6 +109,7 @@
                 <slider
                         decimal_digits="1"
                         follows="left|top"
+                        increment="0.01"
                         initial_value="0"
                         layout="topleft"
                         label="X:"
@@ -119,6 +122,7 @@
                 <slider
                         decimal_digits="1"
                         follows="left|top"
+                        increment="0.01"
                         initial_value="0"
                         layout="topleft"
                         label="Y:"
@@ -168,6 +172,7 @@
                     decimal_digits="2"
                     follows="left|top"
                     height="10"
+                    increment="0.01"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
@@ -181,6 +186,7 @@
                     decimal_digits="2"
                     follows="left|top"
                     height="10"
+                    increment="0.01"
                     initial_value="0"
                     layout="topleft"
                     left_delta="0"
@@ -194,6 +200,7 @@
                     decimal_digits="2"
                     follows="left|top"
                     height="10"
+                    increment="0.01"
                     initial_value="0"
                     layout="topleft"
                     left_delta="0"
@@ -216,6 +223,7 @@
                     decimal_digits="2"
                     follows="left|top"
                     height="10"
+                    increment="0.01"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
@@ -229,6 +237,7 @@
                     decimal_digits="2"
                     follows="left|top"
                     height="10"
+                    increment="0.01"
                     initial_value="0"
                     layout="topleft"
                     left_delta="0"
@@ -242,6 +251,7 @@
                     decimal_digits="2"
                     follows="left|top"
                     height="10"
+                    increment="0.01"
                     initial_value="0"
                     layout="topleft"
                     left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index c0bd123fbc..0eb4e5be94 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -53,6 +53,7 @@
                     decimal_digits="2"
                     follows="left|top"
                     height="10"
+                    increment="0.01"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
@@ -74,6 +75,7 @@
                     decimal_digits="2"
                     follows="left|top"
                     height="10"
+                    increment="0.01"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
@@ -95,6 +97,7 @@
                     decimal_digits="2"
                     follows="left|top"
                     height="10"
+                    increment="0.01"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index fe088d98cf..eb4664616e 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -63,6 +63,7 @@
                     decimal_digits="1"
                     follows="left|top|right"
                     height="10"
+                    increment="0.01"
                     initial_value="0"
                     layout="top"
                     left_delta="15"
@@ -81,6 +82,7 @@
                     decimal_digits="1"
                     follows="left|top|right"
                     height="10"
+                    increment="0.01"
                     initial_value="0"
                     layout="top"
                     left_delta="15"
@@ -158,6 +160,7 @@
                         <slider
                                 decimal_digits="1"
                                 follows="left|top"
+                                increment="0.01"
                                 initial_value="0"
                                 layout="topleft"
                                 label="X:"
@@ -170,6 +173,7 @@
                         <slider
                                 decimal_digits="1"
                                 follows="left|top"
+                                increment="0.01"
                                 initial_value="0"
                                 layout="topleft"
                                 label="Y:"
@@ -205,6 +209,7 @@
                         <slider
                                 decimal_digits="1"
                                 follows="left|top"
+                                increment="0.01"
                                 initial_value="0"
                                 layout="topleft"
                                 label="X:"
@@ -217,6 +222,7 @@
                         <slider
                                 decimal_digits="1"
                                 follows="left|top"
+                                increment="0.01"
                                 initial_value="0"
                                 layout="topleft"
                                 label="Y:"
@@ -241,6 +247,7 @@
                     <slider
                             decimal_digits="1"
                             follows="left|top"
+                            increment="0.01"
                             initial_value="0.7"
                             layout="topleft"
                             label="X:"
@@ -252,6 +259,7 @@
                     <slider
                             decimal_digits="1"
                             follows="left|top"
+                            increment="0.01"
                             initial_value="0.7"
                             layout="topleft"
                             max_val="10"
@@ -262,6 +270,7 @@
                     <slider
                             decimal_digits="1"
                             follows="left|top"
+                            increment="0.01"
                             initial_value="0.7"
                             layout="topleft"
                             max_val="10"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 5f30a7e87d..55a871d120 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3850,6 +3850,11 @@ Abuse Report</string>
   <string name="Female - Shrug">Female - Shrug</string>
   <string name="Female - Stick tougue out">Female - Stick tongue out</string>
   <string name="Female - Wow">Female - Wow</string>
+  <!-- settings -->
+  <string name="New Daycycle">New Daycycle</string>
+  <string name="New Water">New Water</string>
+  <string name="New Sky">New Sky</string>
+  
 
   <string name="/bow">/bow</string>
   <string name="/clap">/clap</string>
-- 
cgit v1.2.3


From c238fa3ac5a3f93dcbf95e3cf7a7f8b576ab751c Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 8 May 2018 16:57:14 -0700
Subject: Add save/update functionality hooks to fixed editor.

---
 .../default/xui/en/floater_fixedenvironment.xml    |   86 +-
 .../skins/default/xui/en/menu_save_settings.xml    |   43 +
 .../skins/default/xui/en/panel_outfit_edit.xml     | 1048 ++++++++++----------
 3 files changed, 633 insertions(+), 544 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_save_settings.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index 2590bb3410..38ce131dc2 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -34,7 +34,7 @@
                     width="35"
                     height="20"
                     font="SansSerif">
-            Name:
+                Name:
             </text>
             <line_editor
                     follows="left|top"
@@ -83,7 +83,7 @@
                 <!-- Tabs inserted here in code -->
                 <!-- -->
                 <!-- -->
-                
+
                 <!-- -->
             </tab_container>
         </layout_panel>
@@ -93,25 +93,71 @@
                 user_resize="false"
                 height="40"
                 visible="true">
-            <button
+            <layout_stack
+                    follows="bottom|left|right"
                     height="23"
-                    label="Save"
-                    follows="left|top"
-                    font="SansSerif"
-                    name="btn_commit"
-                    tool_tip="Load a settings from inventory" 
-                    width="96" />
-            <button
-                    height="23"
-                    label="Cancel"
-                    follows="right|top"
-                    right="-10"
-                    top_delta="0"
-                    font="SansSerif"
-                    name="btn_cancel"
-                    tool_tip="Load a settings from inventory" 
-                    width="96" />
-
+                    layout="topleft"
+                    mouse_opaque="false"
+                    name="button_bar_ls"
+                    left="0"
+                    orientation="horizontal"
+                    top="0"
+                    width="313">
+                <layout_panel
+                        follows="bottom|left|right"
+                        height="23"
+                        layout="bottomleft"
+                        left="0"
+                        mouse_opaque="false"
+                        name="save_btn_lp"
+                        auto_resize="true"
+                        width="156">
+                    <button
+                            follows="bottom|left|right"
+                            height="23"
+                            label="Save"
+                            left="1"
+                            layout="topleft"
+                            name="btn_commit"
+                            top="0"
+                            width="155" />
+                    <button
+                            follows="bottom|right"
+                            height="23"
+                            name="btn_flyout"
+                            label=""
+                            layout="topleft"
+                            left_pad="-20"
+                            tab_stop="false"
+                            top="0"
+                            image_selected="SegmentedBtn_Right_Selected_Press"
+                            image_unselected="SegmentedBtn_Right_Off"
+                            image_pressed="SegmentedBtn_Right_Press"
+                            image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+                            image_overlay="Arrow_Small_Up"
+                            width="20"/>
+                </layout_panel>
+                <layout_panel
+                        follows="bottom|left|right"
+                        height="23"
+                        layout="bottomleft"
+                        left_pad="3"
+                        mouse_opaque="false"
+                        name="revert_btn_lp"
+                        auto_resize="true"
+                        width="147">
+                    <button
+                            follows="bottom|right"
+                            height="23"
+                            right="-1"
+                            label="Cancel"
+                            layout="topleft"
+                            name="btn_cancel"
+                            top="0"
+                            tool_tip="Revert to last saved version"
+                            width="147" />
+                </layout_panel>
+            </layout_stack>
         </layout_panel>
     </layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_save_settings.xml b/indra/newview/skins/default/xui/en/menu_save_settings.xml
new file mode 100644
index 0000000000..fcdd711366
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_save_settings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+        height="602"
+        layout="topleft"
+        mouse_opaque="false"
+        name="save_settings_menu"
+        width="120">
+    <menu_item_call 
+            name="save_settings" 
+            label="Save">
+        <menu_item_call.on_click 
+                function="FlyoutCombo.Button.Action"
+                userdata="save"/>
+    </menu_item_call>
+    <menu_item_call 
+            name="save_as_new_settings" 
+            label="Save As">
+        <menu_item_call.on_click 
+                function="FlyoutCombo.Button.Action"
+                userdata="saveas" />
+    </menu_item_call>
+    <menu_item_call
+            name="apply_local"
+            label="Apply Locally">
+        <menu_item_call.on_click 
+                function="FlyoutCombo.Button.Action"
+                userdata="local" />
+    </menu_item_call>
+    <menu_item_call
+            name="apply_parcel"
+            label="Apply Parcel">
+        <menu_item_call.on_click 
+                function="FlyoutCombo.Button.Action"
+                userdata="parcel" />
+    </menu_item_call>
+    <menu_item_call
+            name="apply_region"
+            label="Apply Region">
+        <menu_item_call.on_click 
+                function="FlyoutCombo.Button.Action"
+                userdata="region" />
+    </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 3f13cea58e..afce9f6eb5 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -1,556 +1,556 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- Side tray Outfit Edit panel -->
 <panel
- background_visible="true"
- border="false"
- height="600"
- follows="all"
- layout="topleft"
- help_topic="edit_outfit"
- left="0"
- min_height="350"
- name="outfit_edit"
- top="0"
- width="320">
-	<string
-	 name="No Outfit"
-	 value="No Outfit"/>
-	<string
-	 name="unsaved_changes"
-	 value="Unsaved Changes"/>
-	<string
-	 name="now_editing"
-	 value="Now Editing"/>
-	<string
-	 name="folder_view_off"
-	 value="Hierarchy_View_Disabled"
-	 translate="false"/>
-	<string
-	 name="folder_view_on"
-	 value="Hierarchy_View_On"
-	 translate="false"/>
-	<string
-	 name="list_view_off"
-	 value="List_View_Disabled"
-	 translate="false"/>
-	<string
-	 name="list_view_on"
-	 value="List_View_On"
-	 translate="false"/>
+        background_visible="true"
+        border="false"
+        height="600"
+        follows="all"
+        layout="topleft"
+        help_topic="edit_outfit"
+        left="0"
+        min_height="350"
+        name="outfit_edit"
+        top="0"
+        width="320">
+    <string
+            name="No Outfit"
+            value="No Outfit"/>
+    <string
+            name="unsaved_changes"
+            value="Unsaved Changes"/>
+    <string
+            name="now_editing"
+            value="Now Editing"/>
+    <string
+            name="folder_view_off"
+            value="Hierarchy_View_Disabled"
+            translate="false"/>
+    <string
+            name="folder_view_on"
+            value="Hierarchy_View_On"
+            translate="false"/>
+    <string
+            name="list_view_off"
+            value="List_View_Disabled"
+            translate="false"/>
+    <string
+            name="list_view_on"
+            value="List_View_On"
+            translate="false"/>
 
-	<panel.string
-		name="not_available">
-		(N\A)
-	</panel.string>
-	<panel.string
-		name="unknown">
-		(unknown)
-	</panel.string>
+    <panel.string
+            name="not_available">
+        (N\A)
+    </panel.string>
+    <panel.string
+            name="unknown">
+        (unknown)
+    </panel.string>
 
-	<!-- Wearables filtering strings -->
-	<string name="Filter.All" value="All"/>
-	<string name="Filter.Clothes/Body" value="Clothes/Body"/>
-	<string name="Filter.Objects" value="Objects"/>
-	<string name="Filter.Clothing" value="Clothing"/>
-	<string name="Filter.Bodyparts" value="Body parts"/>
+    <!-- Wearables filtering strings -->
+    <string name="Filter.All" value="All"/>
+    <string name="Filter.Clothes/Body" value="Clothes/Body"/>
+    <string name="Filter.Objects" value="Objects"/>
+    <string name="Filter.Clothing" value="Clothing"/>
+    <string name="Filter.Bodyparts" value="Body parts"/>
 
-	<string
-	 name="replace_body_part"
-	 value="Click to replace your existing shape"/>
+    <string
+            name="replace_body_part"
+            value="Click to replace your existing shape"/>
 
 
-	<button
-	 follows="top|left"
-	 height="24"
-	 image_hover_unselected="BackButton_Over"
-	 image_pressed="BackButton_Press"
-	 image_unselected="BackButton_Off"
-	 layout="topleft"
-	 name="back_btn"
-	 left="5"
-	 tab_stop="false"
-	 top="1"
-	 width="30"
-	 use_draw_context_alpha="false" />
-	<text
-	 follows="top|left|right"
-	 font="SansSerifHugeBold"
-	 height="26"
-	 layout="topleft"
-	 left_pad="10"
-	 name="title"
-	 text_color="LtGray"
-	 top="0"
-	 value="Edit Outfit"
-	 use_ellipses="true"
-	 width="275" />
+    <button
+            follows="top|left"
+            height="24"
+            image_hover_unselected="BackButton_Over"
+            image_pressed="BackButton_Press"
+            image_unselected="BackButton_Off"
+            layout="topleft"
+            name="back_btn"
+            left="5"
+            tab_stop="false"
+            top="1"
+            width="30"
+            use_draw_context_alpha="false" />
+    <text
+            follows="top|left|right"
+            font="SansSerifHugeBold"
+            height="26"
+            layout="topleft"
+            left_pad="10"
+            name="title"
+            text_color="LtGray"
+            top="0"
+            value="Edit Outfit"
+            use_ellipses="true"
+            width="275" />
 
-	<!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" -->
-	<panel
-	 background_visible="true"
-	 bg_alpha_color="DkGray2"
-	 bevel_style="none"
-	 follows="top|left|right"
-	 height="40"
-	 layout="topleft"
-	 left="6"
-	 name="header_panel"
-	 top_pad="5"
-	 width="311">
-		<icon
-		 follows="left|top"
-		 height="31"
-		 image_name="Shirt_Large"
-		 left="2"
-		 mouse_opaque="false"
-		 name="outfit_icon"
-		 top="2"
-		 scale_image="true"
-		 visible="true"
-		 width="31" />
-		<panel
-		 bevel_style="none"
-		 follows="top|left|right"
-		 height="37"
-		 layout="topleft"
-		 left_pad="5"
-		 name="outfit_name_and_status"
-		 top="2"
-		 width="270">
-			<text
-			 follows="top|left|right"
-			 font="SansSerifSmallBold"
-			 height="13"
-			 layout="topleft"
-			 name="status"
-			 text_color="EmphasisColor"
-			 top="2"
-			 value="Now editing..."
-			 use_ellipses="true"
-			 width="245" />
-			<text
-			 follows="bottom|left|right"
-			 font="SansSerifLargeBold"
-			 height="18"
-			 layout="topleft"
-			 name="curr_outfit_name"
-			 parse_urls="false"
-			 text_color="LtGray"
-			 top_pad="2"
-			 value="[Current Outfit]"
-			 use_ellipses="true"
-			 width="245" />
-			<loading_indicator
-			 follows="right|top"
-			 height="24"
-			 layout="topleft"
-			 right="-2"
-			 name="edit_outfit_loading_indicator"
-			 top="6"
-			 width="24" />
-		</panel>
-	</panel>
+    <!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" -->
+    <panel
+            background_visible="true"
+            bg_alpha_color="DkGray2"
+            bevel_style="none"
+            follows="top|left|right"
+            height="40"
+            layout="topleft"
+            left="6"
+            name="header_panel"
+            top_pad="5"
+            width="311">
+        <icon
+                follows="left|top"
+                height="31"
+                image_name="Shirt_Large"
+                left="2"
+                mouse_opaque="false"
+                name="outfit_icon"
+                top="2"
+                scale_image="true"
+                visible="true"
+                width="31" />
+        <panel
+                bevel_style="none"
+                follows="top|left|right"
+                height="37"
+                layout="topleft"
+                left_pad="5"
+                name="outfit_name_and_status"
+                top="2"
+                width="270">
+            <text
+                    follows="top|left|right"
+                    font="SansSerifSmallBold"
+                    height="13"
+                    layout="topleft"
+                    name="status"
+                    text_color="EmphasisColor"
+                    top="2"
+                    value="Now editing..."
+                    use_ellipses="true"
+                    width="245" />
+            <text
+                    follows="bottom|left|right"
+                    font="SansSerifLargeBold"
+                    height="18"
+                    layout="topleft"
+                    name="curr_outfit_name"
+                    parse_urls="false"
+                    text_color="LtGray"
+                    top_pad="2"
+                    value="[Current Outfit]"
+                    use_ellipses="true"
+                    width="245" />
+            <loading_indicator
+                    follows="right|top"
+                    height="24"
+                    layout="topleft"
+                    right="-2"
+                    name="edit_outfit_loading_indicator"
+                    top="6"
+                    width="24" />
+        </panel>
+    </panel>
 
 
-	<!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) -->
-	<!-- *NOTE: border_size is used to calculate space between layout panels and also to calculate resize bar's height.
+    <!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) -->
+    <!-- *NOTE: border_size is used to calculate space between layout panels and also to calculate resize bar's height.
 Required height for dragbar (icon in spec) is 10, so resizebar height should be 10 px.
 It is calculated as border_size + 2*UIResizeBarOverlap
 -->
-	<layout_stack
-	 animate="true"
-	 border_size="8"
-	 clip="false"
-	 default_tab_group="2"
-	 follows="all"
-	 height="465"
-	 width="313"
-	 layout="topleft"
-	 orientation="vertical"
-	 name="im_panels"
-	 tab_group="1"
-	 top_pad="5"
-	 left="5">
-		<layout_panel
-		 layout="topleft"
-		 height="187"
-		 min_height="155"
-		 name="outfit_wearables_panel"
-		 width="313"
-		 auto_resize="true"
-		 user_resize="true">
+    <layout_stack
+            animate="true"
+            border_size="8"
+            clip="false"
+            default_tab_group="2"
+            follows="all"
+            height="465"
+            width="313"
+            layout="topleft"
+            orientation="vertical"
+            name="im_panels"
+            tab_group="1"
+            top_pad="5"
+            left="5">
+        <layout_panel
+                layout="topleft"
+                height="187"
+                min_height="155"
+                name="outfit_wearables_panel"
+                width="313"
+                auto_resize="true"
+                user_resize="true">
 
-			<layout_stack
-			 animate="true"
-			 border_size="0"
-			 follows="all"
-			 height="185"
-			 width="313"
-			 orientation="vertical"
-			 layout="topleft"
-			 name="filter_panels"
-			 top="0"
-			 left="0">
-				<layout_panel
-				 auto_resize="true"
-				 background_visible="false"
-				 layout="topleft"
-				 height="154"
-				 name="add_button_and_combobox"
-				 width="311"
-				 visible="true">
+            <layout_stack
+                    animate="true"
+                    border_size="0"
+                    follows="all"
+                    height="185"
+                    width="313"
+                    orientation="vertical"
+                    layout="topleft"
+                    name="filter_panels"
+                    top="0"
+                    left="0">
+                <layout_panel
+                        auto_resize="true"
+                        background_visible="false"
+                        layout="topleft"
+                        height="154"
+                        name="add_button_and_combobox"
+                        width="311"
+                        visible="true">
 
-					<!-- List containing items from the COF and Base outfit -->
-					<panel
-					 background_visible="false"
-					 class="cof_wearables"
-					 filename="panel_cof_wearables.xml"
-									 follows="all"
-									 height="129"
-					 layout="topleft"
-					 left="1"
-					 name="cof_wearables_list"
-					 top="0"
-					 width="311" />
+                    <!-- List containing items from the COF and Base outfit -->
+                    <panel
+                            background_visible="false"
+                            class="cof_wearables"
+                            filename="panel_cof_wearables.xml"
+                            follows="all"
+                            height="129"
+                            layout="topleft"
+                            left="1"
+                            name="cof_wearables_list"
+                            top="0"
+                            width="311" />
 
-					<button
-					 follows="left|bottom"
-					 height="22"
-					 image_pressed="PushButton_Press"
-					 image_pressed_selected="PushButton_Selected_Press"
-					 image_selected="PushButton_Selected_Press"
-					 is_toggle="true"
-					 label="Add More..."
-					 layout="topleft"
-					 left="2"
-					 name="show_add_wearables_btn"
-					 top_pad="2"
-					 tool_tip="Open/Close"
-					 width="125" />
+                    <button
+                            follows="left|bottom"
+                            height="22"
+                            image_pressed="PushButton_Press"
+                            image_pressed_selected="PushButton_Selected_Press"
+                            image_selected="PushButton_Selected_Press"
+                            is_toggle="true"
+                            label="Add More..."
+                            layout="topleft"
+                            left="2"
+                            name="show_add_wearables_btn"
+                            top_pad="2"
+                            tool_tip="Open/Close"
+                            width="125" />
 
-					<combo_box
-					 follows="left|right|bottom"
-					 height="22"
-	 layout="topleft"
-					 left_pad="5"
-					 name="list_view_filter_combobox"
-					 top_delta="0"
-					 visible="false"
-					 width="152"/>
-					<combo_box
-					 follows="left|right|bottom"
-					 height="22"
-					 layout="topleft"
-					 left_delta="0"
-					 name="folder_view_filter_combobox"
-					 top_delta="0"
-					 visible="false"
-					 width="152"/>
+                    <combo_box
+                            follows="left|right|bottom"
+                            height="22"
+                            layout="topleft"
+                            left_pad="5"
+                            name="list_view_filter_combobox"
+                            top_delta="0"
+                            visible="false"
+                            width="152"/>
+                    <combo_box
+                            follows="left|right|bottom"
+                            height="22"
+                            layout="topleft"
+                            left_delta="0"
+                            name="folder_view_filter_combobox"
+                            top_delta="0"
+                            visible="false"
+                            width="152"/>
 
-					<button
-									 follows="bottom|right"
-									 height="22"
-					 image_overlay="Search_Icon"
-									 image_pressed="PushButton_Press"
-									 image_pressed_selected="PushButton_Selected_Press"
-									 image_selected="PushButton_Selected_Press"
-					 is_toggle="true"
-					 layout="topleft"
-					 name="filter_button"
-									 right="-5"
-					 top_delta="0"
-									 visible="false"
-					 width="20" />
-				</layout_panel>
+                    <button
+                            follows="bottom|right"
+                            height="22"
+                            image_overlay="Search_Icon"
+                            image_pressed="PushButton_Press"
+                            image_pressed_selected="PushButton_Selected_Press"
+                            image_selected="PushButton_Selected_Press"
+                            is_toggle="true"
+                            layout="topleft"
+                            name="filter_button"
+                            right="-5"
+                            top_delta="0"
+                            visible="false"
+                            width="20" />
+                </layout_panel>
 
-				<layout_panel
-				 auto_resize="false"
-				 background_visible="true"
-				 bg_alpha_color="DkGray2"
-				 height="30"
-				 name="filter_panel"
-				 width="311"
-				 visible="false">
+                <layout_panel
+                        auto_resize="false"
+                        background_visible="true"
+                        bg_alpha_color="DkGray2"
+                        height="30"
+                        name="filter_panel"
+                        width="311"
+                        visible="false">
 
-					<filter_editor
-			 background_image="TextField_Search_Off"
-			 enabled="true"
-			 follows="left|right|top"
-			 label="Filter Inventory Wearables"
-			 layout="topleft"
-			 left="5"
-			 width="290"
-			 height="25"
-			 name="look_item_filter"
-			 search_button_visible="true"
-			 text_color="black"
-			 visible="true"/>
+                    <filter_editor
+                            background_image="TextField_Search_Off"
+                            enabled="true"
+                            follows="left|right|top"
+                            label="Filter Inventory Wearables"
+                            layout="topleft"
+                            left="5"
+                            width="290"
+                            height="25"
+                            name="look_item_filter"
+                            search_button_visible="true"
+                            text_color="black"
+                            visible="true"/>
 
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
+                </layout_panel>
+            </layout_stack>
+        </layout_panel>
 
 
-		<layout_panel background_visible="false"
-									bg_alpha_color="DkGray2"
-									auto_resize="true"
-									height="450"
-									min_height="80"
-									name="add_wearables_panel"
-									width="313"
-									tab_group="2"
-									user_resize="true"
-									visible="false">
+        <layout_panel background_visible="false"
+                bg_alpha_color="DkGray2"
+                auto_resize="true"
+                height="450"
+                min_height="80"
+                name="add_wearables_panel"
+                width="313"
+                tab_group="2"
+                user_resize="true"
+                visible="false">
 
-			<!-- this icon represent dragbar between layout panels.
+            <!-- this icon represent dragbar between layout panels.
           	 This is a workaround implemented in EXT-7255 becouse of an issue with layout stack (EXT-7471) -->
-			<icon follows="left|top|right"
-						height="10"
-						image_name="Dragbar"
-						left="0"
-						top_pad="-9"
-						width="313" />
-			<inventory_panel allow_multi_select="true"
-											 background_visible="false"
-											 border="false"
-											 follows="left|top|right|bottom"
-											 height="418"
-											 layout="topleft"
-											 left="0"
-											 mouse_opaque="false"
-											 name="folder_view"
-											 top_pad="0"
-											 width="313"
-											 visible="false"/>
-			<panel name="filtered_wearables_panel"
-						 background_opaque="true"
-						 background_visible="false"
-						 layout="topleft"
-						 follows="left|top|right|bottom"
-						 border="false"
-						 height="418"
-						 left="0"
-						 mouse_opaque="false"
-						 width="310"
-						 top_delta="0"
-						 visible="true">
-				<wearable_items_list color="0.107 0.107 0.107 1"
-														 name="list_view"
-														 allow_select="true"
-														 layout="topleft"
-														 follows="all"
-														 multi_select="true"
-														 width="313"
-														 height="418"
-														 left="0"
-														 top="0"/>
-			</panel>
-			<button follows="bottom|left"
-							height="22"
-							left="2"
-							label="Wear Item"
-							layout="topleft"
-							name="plus_btn"
-							top_pad="5"
-							width="130" />
-		</layout_panel>
-	</layout_stack>
+            <icon follows="left|top|right"
+                    height="10"
+                    image_name="Dragbar"
+                    left="0"
+                    top_pad="-9"
+                    width="313" />
+            <inventory_panel allow_multi_select="true"
+                    background_visible="false"
+                    border="false"
+                    follows="left|top|right|bottom"
+                    height="418"
+                    layout="topleft"
+                    left="0"
+                    mouse_opaque="false"
+                    name="folder_view"
+                    top_pad="0"
+                    width="313"
+                    visible="false"/>
+            <panel name="filtered_wearables_panel"
+                    background_opaque="true"
+                    background_visible="false"
+                    layout="topleft"
+                    follows="left|top|right|bottom"
+                    border="false"
+                    height="418"
+                    left="0"
+                    mouse_opaque="false"
+                    width="310"
+                    top_delta="0"
+                    visible="true">
+                <wearable_items_list color="0.107 0.107 0.107 1"
+                        name="list_view"
+                        allow_select="true"
+                        layout="topleft"
+                        follows="all"
+                        multi_select="true"
+                        width="313"
+                        height="418"
+                        left="0"
+                        top="0"/>
+            </panel>
+            <button follows="bottom|left"
+                    height="22"
+                    left="2"
+                    label="Wear Item"
+                    layout="topleft"
+                    name="plus_btn"
+                    top_pad="5"
+                    width="130" />
+        </layout_panel>
+    </layout_stack>
 
 
-	<!-- BUTTON BAR -->
-	<panel
-	 background_visible="true"
-	 bevel_style="none"
-	 follows="bottom|left|right"
-	 height="27"
-	 layout="topleft"
-	 left="5"
-	 name="no_add_wearables_button_bar"
-	 top_pad="0"
-	 width="313">
-		<menu_button
-		 follows="bottom|left"
-		 height="25"
-		 image_hover_unselected="Toolbar_Left_Over"
-		 image_overlay="OptionsMenu_Off"
-		 image_selected="Toolbar_Left_Selected"
-		 image_unselected="Toolbar_Left_Off"
-		 layout="topleft"
-		 left="0"
-		 name="gear_menu_btn"
-		 top="1"
-		 width="31" />
-		<icon
-		 follows="bottom|left|right"
-		 height="25"
-		 image_name="Toolbar_Middle_Off"
-		 layout="topleft"
-		 left_pad="1"
-		 name="dummy_right_icon"
-		 width="250" />
-		<button
-		 follows="bottom|right"
-		 height="25"
-		 image_hover_unselected="Toolbar_Right_Over"
-		 image_overlay="Shop"
-		 image_selected="Toolbar_Right_Selected"
-		 image_unselected="Toolbar_Right_Off"
-		 layout="topleft"
-		 left_pad="1"
-		 name="shop_btn_1"
-		 top="1"
-		 tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"
-		 width="31" />
-	</panel>
+    <!-- BUTTON BAR -->
+    <panel
+            background_visible="true"
+            bevel_style="none"
+            follows="bottom|left|right"
+            height="27"
+            layout="topleft"
+            left="5"
+            name="no_add_wearables_button_bar"
+            top_pad="0"
+            width="313">
+        <menu_button
+                follows="bottom|left"
+                height="25"
+                image_hover_unselected="Toolbar_Left_Over"
+                image_overlay="OptionsMenu_Off"
+                image_selected="Toolbar_Left_Selected"
+                image_unselected="Toolbar_Left_Off"
+                layout="topleft"
+                left="0"
+                name="gear_menu_btn"
+                top="1"
+                width="31" />
+        <icon
+                follows="bottom|left|right"
+                height="25"
+                image_name="Toolbar_Middle_Off"
+                layout="topleft"
+                left_pad="1"
+                name="dummy_right_icon"
+                width="250" />
+        <button
+                follows="bottom|right"
+                height="25"
+                image_hover_unselected="Toolbar_Right_Over"
+                image_overlay="Shop"
+                image_selected="Toolbar_Right_Selected"
+                image_unselected="Toolbar_Right_Off"
+                layout="topleft"
+                left_pad="1"
+                name="shop_btn_1"
+                top="1"
+                tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"
+                width="31" />
+    </panel>
 
 
-	<!-- BUTTON BAR - WEARABLES ADDING MODE -->
-	<panel
-	 background_visible="true"
-	 bevel_style="none"
-	 follows="left|right|bottom"
-	 height="27"
-	 layout="topleft"
-	 left="5"
-	 name="add_wearables_button_bar"
-	 top_delta="0"
-	 visible="false"
-	 width="313">
-		<menu_button
-		 follows="bottom|left"
-		 height="25"
-		 image_hover_unselected="Toolbar_Left_Over"
-		 image_overlay="OptionsMenu_Off"
-		 image_selected="Toolbar_Left_Selected"
-		 image_unselected="Toolbar_Left_Off"
-		 layout="topleft"
-		 left="0"
-		 name="wearables_gear_menu_btn"
-		 top="1"
-		 width="31" />
-		<button
-		 follows="bottom|left"
-		 height="25"
-		 image_hover_unselected="Toolbar_Middle_Over"
-		 image_overlay="Hierarchy_View_Disabled"
-		 image_selected="Toolbar_Middle_Selected"
-		 image_unselected="Toolbar_Middle_Off"
-		 is_toggle="true"
-		 layout="topleft"
-		 left_pad="1"
-		 name="folder_view_btn"
-		 top="1"
-		 width="31" />
-		<button
-		 follows="bottom|left"
-		 height="25"
-		 image_hover_unselected="Toolbar_Middle_Over"
-		 image_overlay="List_View_On"
-		 image_selected="Toolbar_Middle_Selected"
-		 image_unselected="Toolbar_Middle_Off"
-		 is_toggle="true"
-		 layout="topleft"
-		 left_pad="1"
-		 name="list_view_btn"
-		 top="1"
-		 width="31" />
-		<icon
-		 follows="bottom|left|right"
-		 height="25"
-			image_name="Toolbar_Middle_Off"
-		 layout="topleft"
-		 left_pad="1"
-			name="dummy_right_icon"
-			width="186" >
-		</icon>
-		<button
-		 follows="bottom|right"
-		 height="25"
-		 image_hover_unselected="Toolbar_Right_Over"
-		 image_overlay="Shop"
-		 image_selected="Toolbar_Right_Selected"
-		 image_unselected="Toolbar_Right_Off"
-		 layout="topleft"
-		 left_pad="1"
-		 name="shop_btn_2"
-		 top="1"
-		 tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"
-		 width="31" />
-	</panel>
+    <!-- BUTTON BAR - WEARABLES ADDING MODE -->
+    <panel
+            background_visible="true"
+            bevel_style="none"
+            follows="left|right|bottom"
+            height="27"
+            layout="topleft"
+            left="5"
+            name="add_wearables_button_bar"
+            top_delta="0"
+            visible="false"
+            width="313">
+        <menu_button
+                follows="bottom|left"
+                height="25"
+                image_hover_unselected="Toolbar_Left_Over"
+                image_overlay="OptionsMenu_Off"
+                image_selected="Toolbar_Left_Selected"
+                image_unselected="Toolbar_Left_Off"
+                layout="topleft"
+                left="0"
+                name="wearables_gear_menu_btn"
+                top="1"
+                width="31" />
+        <button
+                follows="bottom|left"
+                height="25"
+                image_hover_unselected="Toolbar_Middle_Over"
+                image_overlay="Hierarchy_View_Disabled"
+                image_selected="Toolbar_Middle_Selected"
+                image_unselected="Toolbar_Middle_Off"
+                is_toggle="true"
+                layout="topleft"
+                left_pad="1"
+                name="folder_view_btn"
+                top="1"
+                width="31" />
+        <button
+                follows="bottom|left"
+                height="25"
+                image_hover_unselected="Toolbar_Middle_Over"
+                image_overlay="List_View_On"
+                image_selected="Toolbar_Middle_Selected"
+                image_unselected="Toolbar_Middle_Off"
+                is_toggle="true"
+                layout="topleft"
+                left_pad="1"
+                name="list_view_btn"
+                top="1"
+                width="31" />
+        <icon
+                follows="bottom|left|right"
+                height="25"
+                image_name="Toolbar_Middle_Off"
+                layout="topleft"
+                left_pad="1"
+                name="dummy_right_icon"
+                width="186" >
+        </icon>
+        <button
+                follows="bottom|right"
+                height="25"
+                image_hover_unselected="Toolbar_Right_Over"
+                image_overlay="Shop"
+                image_selected="Toolbar_Right_Selected"
+                image_unselected="Toolbar_Right_Off"
+                layout="topleft"
+                left_pad="1"
+                name="shop_btn_2"
+                top="1"
+                tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"
+                width="31" />
+    </panel>
 
-	<!-- SAVE AND REVERT BUTTONS -->
-	<panel
-	 follows="left|right|bottom"
-	 height="30"
-	 layout="topleft"
-	 left="4"
-	 top_pad="2"
-	 name="save_revert_button_bar"
-	 width="300">
-		<layout_stack
-						 follows="bottom|left|right"
-					 height="23"
-					 layout="topleft"
-					 mouse_opaque="false"
-					 name="button_bar_ls"
-					 left="0"
-					 orientation="horizontal"
-					 top="0"
-					 width="313">
-			<layout_panel
-					 follows="bottom|left|right"
-					 height="23"
-								 layout="bottomleft"
-								 left="0"
-								 mouse_opaque="false"
-								 name="save_btn_lp"
-								 auto_resize="true"
-								 width="156">
-				<button
-                         follows="bottom|left|right"
-         height="23"
-         label="Save"
-                         left="1"
-         layout="topleft"
-         name="save_btn"
-         top="0"
-         width="155" />
-				<button
-                         follows="bottom|right"
-         height="23"
-         name="save_flyout_btn"
-         label=""
-         layout="topleft"
-         left_pad="-20"
-         tab_stop="false"
-         top="0"
-         image_selected="SegmentedBtn_Right_Selected_Press"
-         image_unselected="SegmentedBtn_Right_Off"
-         image_pressed="SegmentedBtn_Right_Press"
-         image_pressed_selected="SegmentedBtn_Right_Selected_Press"
-         image_overlay="Arrow_Small_Up"
-         width="20"/>
-			</layout_panel>
-			<layout_panel
-								 follows="bottom|left|right"
-								 height="23"
-								 layout="bottomleft"
-								 left_pad="3"
-								 mouse_opaque="false"
-								 name="revert_btn_lp"
-								 auto_resize="true"
-								 width="147">
-				<button
-         follows="bottom|left|right"
-         height="23"
-                         left="0"
-         label="Undo Changes"
-         layout="topleft"
-         name="revert_btn"
-         top="0"
-         tool_tip="Revert to last saved version"
-         width="147" />
-			</layout_panel>
-		</layout_stack>
-	</panel>
+    <!-- SAVE AND REVERT BUTTONS -->
+    <panel
+            follows="left|right|bottom"
+            height="30"
+            layout="topleft"
+            left="4"
+            top_pad="2"
+            name="save_revert_button_bar"
+            width="300">
+        <layout_stack
+                follows="bottom|left|right"
+                height="23"
+                layout="topleft"
+                mouse_opaque="false"
+                name="button_bar_ls"
+                left="0"
+                orientation="horizontal"
+                top="0"
+                width="313">
+            <layout_panel
+                    follows="bottom|left|right"
+                    height="23"
+                    layout="bottomleft"
+                    left="0"
+                    mouse_opaque="false"
+                    name="save_btn_lp"
+                    auto_resize="true"
+                    width="156">
+                <button
+                        follows="bottom|left|right"
+                        height="23"
+                        label="Save"
+                        left="1"
+                        layout="topleft"
+                        name="save_btn"
+                        top="0"
+                        width="155" />
+                <button
+                        follows="bottom|right"
+                        height="23"
+                        name="save_flyout_btn"
+                        label=""
+                        layout="topleft"
+                        left_pad="-20"
+                        tab_stop="false"
+                        top="0"
+                        image_selected="SegmentedBtn_Right_Selected_Press"
+                        image_unselected="SegmentedBtn_Right_Off"
+                        image_pressed="SegmentedBtn_Right_Press"
+                        image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+                        image_overlay="Arrow_Small_Up"
+                        width="20"/>
+            </layout_panel>
+            <layout_panel
+                    follows="bottom|left|right"
+                    height="23"
+                    layout="bottomleft"
+                    left_pad="3"
+                    mouse_opaque="false"
+                    name="revert_btn_lp"
+                    auto_resize="true"
+                    width="147">
+                <button
+                        follows="bottom|left|right"
+                        height="23"
+                        left="0"
+                        label="Undo Changes"
+                        layout="topleft"
+                        name="revert_btn"
+                        top="0"
+                        tool_tip="Revert to last saved version"
+                        width="147" />
+            </layout_panel>
+        </layout_stack>
+    </panel>
 </panel>
-- 
cgit v1.2.3


From cef4e29b901c5a8964e53ec3eb6659faeea0059a Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 11 May 2018 20:10:08 +0300
Subject: MAINT-8344 Day cycle editor (part 1)

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  | 476 ++++++++++++++++++---
 1 file changed, 413 insertions(+), 63 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 88423ad023..70f5e21327 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-        legacy_header_height="18"
-        height="500"
+        height="602"
         layout="topleft"
         name="env_edit_extdaycycle"
         help_topic="day_presets"
@@ -13,43 +12,53 @@
     <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>
+  
+    <!-- Todo: These 5 strings might be subjected to a change to get dynamic labels-->
+    <string name="0_label">0%[DSC]</string>
+    <string name="1_label">25%[DSC]</string>
+    <string name="2_label">50%[DSC]</string>
+    <string name="3_label">75%[DSC]</string>
+    <string name="4_label">100%[DSC]</string>
+    <string name="time_label"> ([TIME] hr)</string>
 
     <layout_stack name="test_stack"
             width="705"
-            height="500"
+            height="602"
             follows="all"
+            animate="false"
+            top="0"
             orientation="vertical">
         <layout_panel name="temp"
                 border="false"
                 auto_resize="false"
                 user_resize="true"
-                height="45"
-                min_height="45"
+                height="29"
+                min_height="29"
                 background_visible="false">
             <!-- This layout_panel is for loading legacy presets -->
             <text
-                    follows="top|left|right"
+                    follows="top|left"
                     font="SansSerif"
                     height="10"
                     layout="topleft"
                     name="label"
-                    top_delta="70"
-                    width="120">
-                Preset Name:
+                    left="15"
+                    top="5"
+                    width="105">
+              Day Cycle Name:
             </text>
-            <combo_box
-                    allow_text_entry="true"
+            <line_editor
                     follows="top|left"
                     layout="topleft"
                     left_pad="10"
                     max_chars="100"
-                    name="day_cycle_preset_combo"
-                    top_delta="-5"
-                    width="200" />           
+                    name="day_cycle_name"
+                    top="5"
+                    width="200"
+                    height="21" />
         </layout_panel>
-        <layout_panel name="timeline"
-                border="true"
+        <layout_panel name="timeline_track_selection"
+                border="false"
                 bevel_style="in"
                 auto_resize="false"
                 user_resize="true"
@@ -58,74 +67,415 @@
                 min_height="0"
                 visible="true"
                 background_visible="true">
-            <text
-                    follows="top|left|right"
-                    font="SansSerif"
+            <panel name="timeline_layers"
+                    border="false"
+                    follows="left|top"
+                    auto_resize="false"
+                    user_resize="true"
+                    bg_alpha_color="yellow"
+                    height="150"
+                    width="110"
+                    top_pad="0"
+                    min_height="0"
+                    visible="true"
+                    background_visible="true">
+                <button
+                        follows="left|top"
+                        height="23"
+                        label="Sky 4"
+                        layout="topleft"
+                        top_pad="5"
+                        left="10"
+                        name="sky4_track"
+                        width="100"> 
+                    <button.commit_callback
+                      function="DayCycle.Track"
+                      parameter="1" />
+                </button>
+                <button
+                        follows="left|top"
+                        height="23"
+                        label="Sky 3"
+                        layout="topleft"
+                        top_pad="0"
+                        left="10"
+                        name="sky3_track"
+                        width="100"> 
+                    <button.commit_callback
+                      function="DayCycle.Track"
+                      parameter="2" />
+                </button>
+                <button
+                        follows="left|top"
+                        height="23"
+                        label="Sky 2"
+                        layout="topleft"
+                        top_pad="0"
+                        left="10"
+                        name="sky2_track"
+                        width="100"> 
+                    <button.commit_callback
+                      function="DayCycle.Track"
+                      parameter="3" />
+                </button>
+                <button
+                        follows="left|top"
+                        height="23"
+                        label="Sky 1"
+                        layout="topleft"
+                        top_pad="0"
+                        left="10"
+                        name="sky1_track"
+                        width="100"> 
+                    <button.commit_callback
+                      function="DayCycle.Track"
+                      parameter="4" />
+                </button>
+                <button
+                        follows="left|top"
+                        height="23"
+                        label="Water"
+                        layout="topleft"
+                        top_pad="0"
+                        left="10"
+                        name="water_track"
+                        width="100"> 
+                    <button.commit_callback
+                      function="DayCycle.Track"
+                      parameter="0" />
+                </button>
+            </panel>
+            <panel name="timeline"
+                    border="true"
+                    follows="left|top"
+                    auto_resize="false"
+                    user_resize="true"
+                    height="150"
+                    min_height="0"
+                    width="595"
+                    min_width="595"
+                    left_pad="0"
+                    visible="true">              
+                        <text
+                         follows="left|top"
+                         height="15"
+                         layout="topleft"
+                         left="10"
+                         name="p0"
+                         top_pad="5"
+                         value="0%"
+                         width="50" />
+                        <text
+                         follows="left|top|right"
+                         height="15"
+                         layout="topleft"
+                         left_pad="69"
+                         name="p1"
+                         top_delta="0"
+                         value="25%"
+                         width="50" />
+                        <text
+                         follows="left|top|right"
+                         height="15"
+                         layout="topleft"
+                         left_pad="69"
+                         name="p2"
+                         top_delta="0"
+                         value="50%"
+                         width="50" />
+                        <text
+                         follows="left|top|right"
+                         height="15"
+                         layout="topleft"
+                         left_pad="69"
+                         name="p3"
+                         top_delta="0"
+                         value="75%"
+                         width="50" />
+                        <text
+                         follows="left|top|right"
+                         height="15"
+                         layout="topleft"
+                         left_pad="69"
+                         name="p4"
+                         top_delta="0"
+                         value="100%"
+                         width="50" />
+                  <multi_slider
+                    can_edit_text="true"
+                    decimal_digits="0"
+                    draw_track="false"
+                    follows="bottom"
                     height="10"
+                    increment="0.0833333"
+                    initial_value="0"
                     layout="topleft"
-                    name="label"
-                    top_offset="20"
-                    left_offset="10"
-                    width="120">
-                Time Line Goes here
-            </text>
+                    left="10"
+                    max_sliders="20"
+                    max_val="24"
+                    name="WLTimeSlider"
+                    show_text="false"
+                    top_pad="0"
+                    use_triangle="true"
+                    width="525"
+                    min_width="525"/>
+          
+                  <multi_slider
+                      can_edit_text="true"
+                      decimal_digits="0"
+                      follows="bottom"
+                      height="10"
+                      increment="0.0833333"
+                      initial_value="0"
+                      layout="topleft"
+                      left="10"
+                      max_sliders="20"
+                      max_val="24"
+                      name="WLDayCycleKeys"
+                      show_text="false"
+                      top_pad="15"
+                      width="525"
+                      min_width="525" />
+              
+            <line_editor
+             border_style="line"
+             border_thickness="1"
+             follows="left|bottom"
+             font="SansSerif"
+             height="20"
+             layout="topleft"
+             left_pad="0"
+             max_length_bytes="300"
+             name="timeline_field"
+             select_on_focus="true"
+             value="%"
+             tool_tip="The full path to an editor (executable) to edit floater XML files (quotes not necessary)"
+             top_delta="-5"
+             width="35" />
+
+              <layout_stack
+                name="progress_control"
+                follows="top|left"
+                height="25"
+                width="83"
+                layout="topleft"
+                animate="false"
+                left="225"
+                top_pad="40"
+                orientation="horizontal">
+
+                <layout_panel
+                  name="skip_back"
+                  mouse_opaque="false"
+                  auto_resize="false"
+                  layout="topleft"
+                  top="0"
+                  height="25"
+                  min_width="25"
+                  width="25">
+                  <button
+                    name="skip_back_btn"
+                    follows="top"
+                    image_overlay="SkipBackward_Off"
+                    image_disabled="PushButton_Disabled"
+                    image_disabled_selected="PushButton_Disabled"
+                    image_selected="PushButton_Selected"
+                    image_unselected="PushButton_Off"
+                    hover_glow_amount="0.15"
+                    auto_resize="false"
+                    width="25"
+                    height="25"
+                    layout="topleft"
+                    tool_tip="Step back"
+                    top="0"
+                    left="0"/>
+                </layout_panel>
+
+                <layout_panel
+                  name="play"
+                  mouse_opaque="false"
+                  auto_resize="false"
+                  layout="topleft"
+                  top="0"
+                  height="25"
+                  min_width="25"
+                  width="25">
+                  <button
+                        name="play_btn"
+                        follows="top"
+                        image_overlay="Play_Off"
+                        image_disabled="PushButton_Disabled"
+                        image_disabled_selected="PushButton_Disabled"
+                        image_selected="PushButton_Selected"
+                        image_unselected="PushButton_Off"
+                        hover_glow_amount="0.15"
+                        auto_resize="false"
+                        layout="topleft"
+                        height="25"
+                        width="25"
+                        left="0"
+                        top="0" />
+                </layout_panel>
+
+                <layout_panel
+                  name="pause"
+                  mouse_opaque="false"
+                  auto_resize="false"
+                  layout="topleft"
+                  top="0"
+                  height="25"
+                  min_width="25"
+                  width="25"
+                  visible="false">
+                  <button
+                        name="pause_btn"
+                        follows="top"
+                        image_overlay="Pause_Off"
+                        image_disabled="PushButton_Disabled"
+                        image_disabled_selected="PushButton_Disabled"
+                        image_selected="PushButton_Selected"
+                        image_unselected="PushButton_Off"
+                        hover_glow_amount="0.15"
+                        auto_resize="false"
+                        layout="topleft"
+                        height="25"
+                        width="25"
+                        left="0"
+                        top="0"/>
+                </layout_panel>
+
+                <layout_panel
+                  name="skip_forward"
+                  mouse_opaque="false"
+                  auto_resize="false"
+                  layout="topleft"
+                  top="0"
+                  height="25"
+                  min_width="25"
+                  width="25">
+                  <button
+                    name="skip_forward_btn"
+                    follows="top"
+                    image_overlay="SkipForward_Off"
+                    image_disabled="PushButton_Disabled"
+                    image_disabled_selected="PushButton_Disabled"
+                    image_selected="PushButton_Selected"
+                    image_unselected="PushButton_Off"
+                    hover_glow_amount="0.15"
+                    width="25"
+                    height="25"
+                    layout="topleft"
+                    tool_tip="Step forward"
+                    top="0" />
+                </layout_panel>
+              </layout_stack>
+              
+            <button
+                    follows="top|left"
+                    height="23"
+                    width="90"
+                    label="Add Frame"
+                    left_pad="175"
+                    top_delta="-12"
+                    name="add_frame" />
+            <button
+                    follows="left|top"
+                    height="23"
+                    width="90"
+                    label="Delete Frame"
+                    top_pad="0"
+                    left_delta="0"
+                    name="delete_frame" />
+            </panel>
         </layout_panel>
-        <layout_panel name="flex"
-                auto_resize="true"
+        <layout_panel name="frame_settings_water"
+                auto_resize="false"
                 user_resize="true"
-                bg_alpha_color="blue"
-                height="11"
+                height="386"
+                width="700"
                 min_height="0"
-                visible="true"
-                background_visible="true">
+                visible="false">
             <tab_container
                     follows="all"
                     halign="left"
                     height="386"
                     layout="topleft"
-                    left_offset="0"
-                    name="landtab"
+                    left="0"
+                    name="water_tabs"
                     tab_position="top"
                     tab_width="140"
                     tab_padding_right="3"
-                    top_offset="6"
-                    width="633">
-                <panel
-                        border="true"
-                        follows="all"
-                        label="DUMMY"
-                        layout="topleft"
-                        left="0"
-                        help_topic="land_general_tab"
-                        name="land_general_panel"
-                        top="0">
-            <text
-                    follows="top|left|right"
-                    font="SansSerif"
-                    height="10"
-                    layout="center"
-                    name="label"
-                    top_offset="20"
-                    left_offset="10"
-                    width="300">
-                Space For editing selected frame
-            </text>
-                        
-                </panel>
+                    top_pad="0"
+                    width="700">
+                       <panel
+                         border="true"
+                         filename="panel_settings_water.xml"
+                         label="Water_panel"
+                         layout="topleft"
+                         left_delta="0"
+                         top_pad="5"
+                         name="water_panel"/>
+            </tab_container>
+        </layout_panel>
+        <layout_panel name="frame_settings_sky"
+                auto_resize="false"
+                user_resize="true"
+                height="386"
+                width="700"
+                min_height="0"
+                visible="true">
+            <tab_container
+                    follows="all"
+                    halign="left"
+                    height="386"
+                    visible="true"
+                    layout="topleft"
+                    left="0"
+                    name="sky_tabs"
+                    tab_position="top"
+                    tab_width="140"
+                    tab_padding_right="3"
+                    top_pad="0"
+                    width="700">
+                       <panel
+                         border="true"
+                         filename="panel_settings_sky_atmos.xml"
+                         label="Atmosphere &amp; Lighting"
+                         layout="topleft"
+                         left_delta="0"
+                         top_pad="5"
+                         name="atmosphere_panel" />
+                       <panel
+                         border="true"
+                         filename="panel_settings_sky_clouds.xml"
+                         label="Clouds"
+                         layout="topleft"
+                         left_delta="0"
+                         top_pad="5"
+                         name="clouds_panel" />
+                       <panel
+                         border="true"
+                         filename="panel_settings_sky_sunmoon.xml"
+                         label="Sun &amp; Moon"
+                         layout="topleft"
+                         left_delta="0"
+                         top_pad="5"
+                         name="moon_panel" />
             </tab_container>
         </layout_panel>
         <layout_panel name="buttons"
                 auto_resize="false"
                 user_resize="true"
-                height="43"
+                height="26"
                 min_height="0"
-                background_visible="false">
+                visible="true"
+                width="700">
             <button
                     follows="top|left"
                     height="23"
                     label="Save"
-                    left_offset="160"
-                    top_offset="60"
+                    left="5"
+                    top_pad="0"
                     name="save_btn"
                     width="100" />
             <button
@@ -138,7 +488,7 @@
                     width="100" /> 
 
             <button
-                    follows="top|right"
+                    follows="top|left"
                     height="23"
                     label="Upload"
                     layout="topleft"
-- 
cgit v1.2.3


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

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
deleted file mode 100644
index c03a206e88..0000000000
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ /dev/null
@@ -1,980 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="375"
- layout="topleft"
- name="Edit Sky Preset"
- help_topic="sky_preset"
- save_rect="true"
- title="Edit Sky Preset"
- width="840">
-
-    <string name="title_new">Create a New Sky Preset</string>
-    <string name="title_edit">Edit Sky Preset</string>
-    <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string>
-    <string name="hint_edit">To edit your sky preset, adjust the controls and click "Save".</string>
-    <string name="combo_label">-Select a preset-</string>
-
-    <text
-     follows="top|left|right"
-     height="10"
-     layout="topleft"
-     left="30"
-     name="hint"
-     top="25"
-     width="700">
-     To edit your preset, adjust the controls then click "Save"
-     </text>
-    <text
-     follows="top|left|right"
-     font="SansSerif"
-     height="10"
-     layout="topleft"
-     left="30"
-     name="label"
-     top_pad="25"
-     width="120">
-        Preset Name:
-    </text>
-    <combo_box
-     allow_text_entry="true"
-     follows="top|left"
-     layout="topleft"
-     left_pad="10"
-     max_chars="100"
-     name="sky_preset_combo"
-     top_delta="-5"
-     width="200"/>
-    <line_editor
-     height="20"
-     left_delta="0"
-     name="sky_preset_name"
-     top_delta="0"
-     width="200" />
-    <text
-     follows="top|left|right"
-     height="40"
-     layout="topleft"
-     left_pad="10"
-     name="note"
-     top_delta="0"
-     width="405"
-     wrap="true">
-     Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
-    </text>
- <!--======== Controls panel ========-->
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="203"
-     layout="topleft"
-     left="25"
-     name="panel_water_preset"
-     top="122"
-     visible="true"
-     width="790"/>
-    <tab_container
-     follows="left|top"
-     height="225"
-     halign="center"
-     layout="topleft"
-     left="22"
-     name="WindLight Tabs"
-     tab_position="top"
-     top="101"
-     width="794">
-    <panel
-     border="true"
-     bevel_style="none"
-     follows="left|top|right|bottom"
-     height="196"
-     label="ATMOSPHERE"
-     layout="topleft"
-     left="1"
-     help_topic="sky_preset_atmosphere"
-     mouse_opaque="false"
-     name="Atmosphere"
-     top="60"
-     width="698">
-
-         <!--======== Tab Panel I. I conlumn of controls ========--> 
-
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         font="SansSerif"
-         height="16"
-         layout="topleft"
-         left="40"
-         name="BHText"
-         top="25"
-         width="200">
-           Blue Horizon
-        </text>
-        <color_swatch
-         can_apply_immediately="true"
-         follows="left|top"
-         height="37"
-         label_height="0"
-         layout="topleft"
-         left_delta="0"
-         name="WLBlueHorizon"
-         top_pad="6"
-         width="60" />
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         font="SansSerif"
-         height="16"
-         layout="topleft"
-         left_delta="0"
-         top_pad="20"
-         name="BDensText"
-         width="200">
-            Haze Horizon
-        </text>
-        <slider
-         control_name="WLHazeHorizon"
-         decimal_digits="2"
-         follows="left|top"
-         height="10"
-         increment="0.01"
-         initial_value="0.25"
-         layout="topleft"
-         left_delta="0"
-         top_pad="6"
-         name="WLHazeHorizon"
-         width="200" />
-
-         <!--======== Tab Panel I. II conlumn of controls ========-->
-
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         font="SansSerif"
-         height="16"
-         layout="topleft"
-         left_pad="55"
-         name="BDensText2"
-         top="25"
-         width="200">
-            Blue Density
-        </text>
-        <color_swatch
-         can_apply_immediately="true"
-         follows="left|top"
-         height="37"
-         label_height="0"
-         layout="topleft"
-         left_delta="0"
-         name="WLBlueDensity"
-         top_pad="6"
-         width="60" />
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         font="SansSerif"
-         height="16"
-         layout="topleft"
-         left_delta="0"
-         name="HDText"
-         top_pad="20"
-         width="200">
-            Haze Density
-        </text>
-        <slider
-         control_name="WLHazeDensity"
-         decimal_digits="2"
-         follows="left|top"
-         height="10"
-         increment="0.01"
-         initial_value="0.7"
-         layout="topleft"
-         left_delta="0"
-         max_val="4"
-         name="WLHazeDensity"
-         top_pad="6"
-         width="200" />
-
-             <!--======== Tab Panel I. III conlumn of controls ========-->
-
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         font="SansSerif"
-         height="16"
-         layout="topleft"
-         left_pad="55"
-         name="DensMultText"
-         top="25"
-         width="200">
-           Density Multiplier
-        </text>
-            <slider
-             control_name="WLDensityMult"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.1"
-             layout="topleft"
-             left_delta="15"
-             max_val="0.9"
-             name="WLDensityMult"
-             top_pad="6"
-             width="200" />
-            
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-15"
-             name="WLDistanceMultText"
-             top_pad="20"
-             width="200">
-                Distance Multiplier
-            </text>
-            <slider
-             control_name="WLDistancMult"
-             decimal_digits="1"
-             follows="left|top"
-             height="10"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="15"
-             max_val="100"
-             name="WLDistanceMult"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-15"
-             name="MaxAltText"
-             top_pad="20"
-             width="200">
-                Max Altitude
-            </text>
-            <slider
-             control_name="WLMaxAltitude"
-             decimal_digits="0"
-             follows="left|top"
-             height="10"
-             increment="1"
-             initial_value="500"
-             layout="topleft"
-             left_delta="15"
-             max_val="4000"
-             name="WLMaxAltitude"
-             top_pad="6"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         bevel_style="none"
-         follows="left|top|right|bottom"
-         height="196"
-         label="LIGHTING"
-         layout="topleft"
-         left_delta="0"
-         help_topic="sky_preset_lighting"
-         name="Lighting"
-         top_delta="4"
-         width="698">
-
-         <!--======== Tab Panel II. I conlumn of controls ========-->
-
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="20"
-             name="SLCText"
-             top="25"
-             width="150">
-                Sun/Moon Color
-            </text>
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="37"
-             label_height="0"
-             layout="topleft"
-             left_delta="10"
-             name="WLSunlight"
-             top_pad="6"
-             width="60" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-10"
-             name="WLAmbientText"
-             top_pad="20"
-             width="150">
-                Ambient
-            </text>
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="37"
-             label_height="0"
-             layout="topleft"
-             left_delta="10"
-             name="WLAmbient"
-             top_pad="6"
-             width="60" />
-
-            <!--======== Tab Panel II. II conlumn of controls ========-->
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_pad="100"
-             name="SunGlowText"
-             top="25"
-             width="200">
-                Sun Glow
-            </text>
-            <slider
-             control_name="WLGlowB"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.1"
-             label="Focus "
-             layout="topleft"
-             left_delta="10"
-             max_val="0.5"
-             name="WLGlowB"
-             top_pad="6"
-             width="200" />
-            <slider
-             control_name="WLGlowR"
-             decimal_digits="2"
-             follows="top|left"
-             height="10"
-             increment="0.01"
-             initial_value="0.25"
-             label="Size    "
-             layout="topleft"
-             left_delta="0"
-             max_val="1.99"
-             min_val="1"
-             name="WLGlowR"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-10"
-             name="WLStarText"
-             top_pad="20"
-             width="200">
-                Star Brightness
-            </text>
-            <slider
-             control_name="WLStarAlpha"
-             decimal_digits="2"
-             follows="top|left"
-             height="10"
-             increment="0.01"
-             initial_value="0"
-             layout="topleft"
-             left_delta="10"
-             max_val="2"
-             name="WLStarAlpha"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-10"
-             name="SceneGammaText"
-             top_pad="20"
-             width="200">
-                Scene Gamma
-            </text>
-            <slider
-             control_name="WLGamma"
-             decimal_digits="2"
-             follows="top|left"
-             height="10"
-             increment="0.01"
-             initial_value="2.0"
-             layout="topleft"
-             left_delta="10"
-             max_val="10"
-             name="WLGamma"
-             top_pad="6"
-             width="200" />
-
-            <!--======== Tab Panel II. III conlumn of controls ========-->
-
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_pad="60"
-             name="TODText"
-             top="25"
-             width="200">
-                Sun/Moon Position
-            </text>
-            
-            <joystick_quat
-              follows="left|top"
-              height="78"
-              layout="topleft"
-              left_delta="0"
-              name="WLSunRotation"
-              quadrant="left"
-              sound_flags="3"
-              visible="true"
-              tool_tip="Move sun in sky"
-              top="44"
-              width="78" />              />
-
-            <joystick_quat
-              follows="left|top"
-              height="78"
-              layout="topleft"
-              left_delta="96"
-              name="WLMoonRotation"
-              quadrant="left"
-              sound_flags="3"
-              visible="true"
-              tool_tip="Move moon in sky"
-              top="44"
-              width="78" />              />
-              
-            <!-- multi_slider
-             can_edit_text="true"
-             control_name="WLSunPos"
-             decimal_digits="0"
-             follows="bottom"
-             height="10"
-             increment="0.0833333"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             max_sliders="1"
-             max_val="24"
-             name="WLSunPos"
-             show_text="false"
-             top_pad="0"
-             width="300" />
-
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_delta="2"
-             name="WL12amHash"
-             top_pad="6"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="66"
-             name="WL6amHash"
-             top_delta="0"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="67"
-             name="WL12pmHash2"
-             top_delta="0"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="67"
-             name="WL6pmHash"
-             top_delta="0"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="67"
-             name="WL12amHash2"
-             top_delta="0"
-             width="6">
-             |
-            </text>
-
-
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_delta="-300"
-             name="WL12am"
-             top="74"
-             width="55">
-             12am
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="20"
-             name="WL6am"
-             top_delta="0"
-             width="55">
-                6am
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="15"
-             name="WL12pmHash"
-             top_delta="0"
-             width="55">
-                12pm
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="18"
-             name="WL6pm"
-             top_delta="0"
-             width="55">
-                6pm
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="15"
-             name="WL12am2"
-             top_delta="0"
-             width="55">
-                12am
-            </text>
-
-            <time
-             follows="left|top"
-             height="16"
-             label_width="0"
-             layout="topleft"
-             left_delta="-175"
-             name="WLDayTime"
-             top_pad="15"
-             value="6:00 AM"
-             width="75"/> 
-
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-106"
-             name="WLEastAngleText"
-             top_pad="24"
-             width="200">
-                East Angle
-            </text>
-            <slider
-             control_name="WLEastAngle"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.0"
-             layout="topleft"
-             left_delta="10"
-             name="WLEastAngle"
-             top_pad="6"
-             width="200" / -->
-
-        </panel>
-        <panel
-         border="true"
-         bevel_style="none"
-         follows="left|top|right|bottom"
-         height="196"
-         label="CLOUDS"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="sky_preset_clouds"
-         name="Clouds"
-         top_delta="4"
-         width="698">
-
-            <!--======== Tab Panel III. I conlumn of controls ========-->
-
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="40"
-             name="WLCloudColorText"
-             top="25"
-             width="200">
-                Cloud Color
-            </text>
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="37"
-             label_height="0"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudColor"
-             top_pad="6"
-             width="60" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudColorText2"
-             top_pad="20"
-             width="200">
-                Cloud XY/Density
-            </text>
-            <slider
-             control_name="WLCloudX"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             label="X"
-             layout="topleft"
-             left_delta="0"
-             top_pad="6"
-             name="WLCloudX"
-             width="200" />
-            <slider
-             control_name="WLCloudY"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             label="Y"
-             layout="topleft"
-             left_delta="0"
-             top_pad="6"
-             name="WLCloudY"
-             width="200" />
-            <slider
-             control_name="WLCloudDensity"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             label="D"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudDensity"
-             top_pad="6"
-             width="200" />
-            
-            <!--======== Tab Panel III. II conlumn of controls ========-->
-            
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_pad="55"
-             name="WLCloudCoverageText"
-             top="15"
-             width="200">
-                Cloud Coverage
-            </text>
-            <slider
-             control_name="WLCloudCoverage"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_delta="15"
-             name="WLCloudCoverage"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-15"
-             name="WLCloudScaleText"
-             top_pad="20"
-             width="200">
-                Cloud Scale
-            </text>
-            <slider
-             control_name="WLCloudScale"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="15"
-             min_val="0.01"
-             name="WLCloudScale"
-             top_pad="6"
-             width="200" />
-            
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="WLCloudDetailText"
-             top_pad="20"
-             width="200">
-                Cloud Detail (XY/Density)
-            </text>
-            <slider
-             control_name="WLCloudDetailX"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             label="X"
-             layout="topleft"
-             left_delta="0"
-             top_pad="6"
-             name="WLCloudDetailX"
-             width="200" />
-            <slider
-             control_name="WLCloudDetailY"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             label="Y"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudDetailY"
-             top_pad="6"
-             width="200" />
-            <slider
-             control_name="WLCloudDetailDensity"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             label="D"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudDetailDensity"
-             top_pad="6"
-             width="200" />
-            
-            <!--======== Tab Panel III. III conlumn of controls ========-->
-            
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_pad="55"
-             name="WLCloudScrollXText"
-             top="15"
-             width="150">
-                Cloud Scroll X
-            </text>
-            <check_box
-             control_name="WLCloudLockX"
-             follows="left|top"
-             height="16"
-             label="Lock"
-             layout="topleft"
-             left_delta="150"
-             name="WLCloudLockX"
-             top_delta="0"
-             width="200" />
-            <slider
-             control_name="WLCloudScrollX"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_delta="-135"
-             max_val="10"
-             min_val="-10"
-             name="WLCloudScrollX"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-15"
-             name="WLCloudScrollYText"
-             top_pad="20"
-             width="150">
-                Cloud Scroll Y
-            </text>
-            <check_box
-             control_name="WLCloudLockY"
-             follows="left|top"
-             height="16"
-             label="Lock"
-             layout="topleft"
-             left_delta="150"
-             name="WLCloudLockY"
-             width="200" />
-            <slider
-             control_name="WLCloudScrollY"
-             decimal_digits="2"
-             follows="left|top"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_delta="-135"
-             max_val="10"
-             min_val="-10"
-             name="WLCloudScrollY"
-             top_pad="6"
-             width="200" />
-        </panel>
-    </tab_container>
-<!--======== End of Controls panel ========-->
-
-    <check_box
-     follows="top|left"
-     height="10"
-     label="Make this preset my new sky setting"
-     layout="topleft"
-     left="380"
-     name="make_default_cb"
-     top_pad="30"
-     width="280"/>
-    <button
-     follows="bottom|right"
-     height="23"
-     label="Save"
-     layout="topleft"
-     left_pad="0"
-     name="save"
-     width="70"/>
-    <button
-     follows="bottom|right"
-     height="23"
-     label="Cancel"
-     layout="topleft"
-     left_pad="15"
-     name="cancel"
-     width="70"/>
- </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
deleted file mode 100644
index 905983e7fa..0000000000
--- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
+++ /dev/null
@@ -1,448 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="375"
- layout="topleft"
- name="Edit Water Preset"
- help_topic="water_preset"
- save_rect="true"
- title="Edit Water Preset"
- width="725">
-
-  <string name="title_new">Create a New Water Preset</string>
-  <string name="title_edit">Edit a Water Preset</string>
-  <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string>
-  <string name="hint_edit">To edit your water preset, adjust the controls and click "Save".</string>
-  <string name="combo_label">-Select a preset-</string>
-
-  <text
-   follows="top|left|right"
-   height="10"
-   layout="topleft"
-   left="30"
-   name="hint"
-   top="25"
-   width="680">
-   	To edit your preset, adjust the controls then click "Save"
-   </text>
-   
-   <text
-   follows="top|left|right"
-   font="SansSerif"
-   height="10"
-   layout="topleft"
-   left="30"
-   name="label"
-   top_pad="25"
-   width="120">
-   	Preset Name:
-   </text>
-   
-   <combo_box
-   	allow_text_entry="true"
-   	follows="top|left"
-   	layout="topleft"
-   	left_pad="10"
-   	max_chars="100"
-   	name="water_preset_combo"
-   	top_delta="-5"
-   	width="200"/>
-
-   <line_editor
-    height="20"
-    left_delta="0"
-    name="water_preset_name"
-    top_delta="0"
-    width="200" />
-   
-   <text
-   follows="top|left|right"
-   height="40"
-   layout="topleft"
-   left_pad="10"
-   name="note"
-   top_delta="0"
-   width="340"
-   wrap="true">
-   	Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
-   </text>
- 
- <!--======== Controls panel ========-->
- <panel
-  border="false"
-  bevel_style="none"
-  follows="top|left"
-  height="230"
-  layout="topleft"
-  left="10"
-  name="panel_water_preset"
-  top="100"
-  width="700">
- 
-<!--======== I conlumn of controls ========-->   
-   <text
-    follows="left|top|right"
-    height="10"
-    font="SansSerif"
-    layout="topleft"
-    left="10"    
-    name="water_color_label"
-    top="5"
-    width="215">
-       Water Fog Color
-   </text>
-   <color_swatch
-    can_apply_immediately="true"
-    follows="left|top"
-    height="37"
-    label_height="0"
-    layout="topleft"
-    left_delta="15"
-    name="WaterFogColor"
-    top_pad="8"
-    width="60" />
-    
-    
-   <text
-    follows="left|top|right"
-    font="SansSerif"
-    layout="topleft"
-    left_delta="-15"
-    top_pad="10"
-    name="water_fog_density_label"
-    width="215">
-    	Fog Density Exponent
-   </text>
-   <slider
-    decimal_digits="1"
-    follows="left|top"
-    height="10"
-    initial_value="0"
-    layout="topleft"
-    left_delta="15"
-    max_val="10"
-    name="WaterFogDensity"
-    top_pad="10"
-    width="200"/>
-    
-    
-   <text
-    follows="left|top|right"
-    font="SansSerif"
-    layout="topleft"
-    left_delta="-15"
-    top_pad="15"
-    name="underwater_fog_modifier_label"
-    width="215">
-    	Underwater Fog Modifier
-   </text>
-   <slider
-    decimal_digits="1"
-    follows="left|top"
-    height="10"
-    initial_value="0"
-    layout="topleft"
-    left_delta="15"
-    max_val="10"
-    name="WaterUnderWaterFogMod"
-    top_pad="10"
-    width="200"/>
-    
-    
-    <text
-     follows="left|top|right"
-     font="SansSerif"
-     layout="topleft"
-     left_delta="-15"
-     name="BHText"
-     top_pad="15"
-     width="215">
-        Big Wave Direction
-    </text>    
-    <slider
-     control_name="WaterWave1DirX"
-     decimal_digits="2"
-     follows="left|top"
-     increment="0.01"
-     initial_value="0.7"
-     label="X"
-     layout="topleft"             
-     max_val="4"
-     min_val="-4"
-     name="WaterWave1DirX"
-     top_pad="10"
-     width="216"/>    
-    <slider
-     control_name="WaterWave1DirY"
-     decimal_digits="2"
-     follows="left|top"
-     increment="0.01"
-     initial_value="0.7"
-     label="Y"
-     layout="topleft"
-     max_val="4"
-     min_val="-4"
-     name="WaterWave1DirY"
-     top_pad="5"
-     width="216"/>
-    
-<!--======== II conlumn of controls ========-->    
-    
-    <text
-     follows="left|top|right"
-     font="SansSerif"
-     height="10"
-     layout="topleft"
-     left_pad="20"
-     name="BDensText"
-     top="5"
-     width="215">
-        Reflection Wavelet Scale
-    </text>
-    <slider
-     control_name="WaterNormalScaleX"
-     decimal_digits="1"
-     follows="left|top"
-     initial_value="0.7"
-     layout="topleft"
-     left_delta="15"
-     max_val="10"
-     name="WaterNormalScaleX"
-     top_pad="10"
-     width="200"/>
-    <slider
-     control_name="WaterNormalScaleY"
-     decimal_digits="1"
-     follows="left|top"
-     initial_value="0.7"
-     layout="topleft"
-     max_val="10"
-     name="WaterNormalScaleY"
-     top_pad="6"
-     width="200"/>
-    <slider
-     control_name="WaterNormalScaleZ"
-     decimal_digits="1"
-     follows="left|top"
-     initial_value="0.7"
-     layout="topleft"
-     max_val="10"
-     name="WaterNormalScaleZ"
-     top_pad="6"
-     width="200"/>
-    
-    
-    <text
-     follows="left|top|right"
-     font="SansSerif"
-     layout="topleft"
-     left_delta="-15"
-     name="HDText"
-     top_pad="16"
-     width="215">
-        Fresnel Scale
-    </text>
-    <slider
-     control_name="WaterFresnelScale"
-     decimal_digits="2"
-     follows="left|top"
-     height="10"
-     increment="0.01"
-     initial_value="0.7"
-     layout="topleft"
-     left_delta="15"
-     name="WaterFresnelScale"
-     top_pad="10"
-     width="200"/>
-    <text
-     follows="left|top|right"
-     font="SansSerif"
-     layout="topleft"
-     left_delta="-15"
-     name="FresnelOffsetText"
-     top_pad="15"
-     width="215">
-        Fresnel Offset
-    </text>
-    <slider
-     control_name="WaterFresnelOffset"
-     decimal_digits="2"
-     follows="left"
-     increment="0.01"
-     initial_value="0.7"
-     layout="topleft"
-     left_delta="15"
-     name="WaterFresnelOffset"
-     top_pad="10"
-     width="200"/>
-     
-     
-     <text
-      follows="left|top|right"
-      font="SansSerif"
-      layout="topleft"
-      left_delta="-15"
-      name="BHText2"
-      top_pad="15"
-      width="215">
-         Little Wave Direction
-     </text>
-     <slider
-      control_name="WaterWave2DirX"
-      decimal_digits="2"
-      follows="left|top"
-      increment="0.01"
-      initial_value="0.7"
-      label="X"
-      layout="topleft"
-      max_val="4"
-      min_val="-4"
-      name="WaterWave2DirX"
-      top_pad="10"
-      width="216" />
-     <slider
-      control_name="WaterWave2DirY"
-      decimal_digits="2"
-      follows="left|top"
-      increment="0.01"
-      initial_value="0.7"
-      label="Y"
-      layout="topleft"
-      max_val="4"
-      min_val="-4"
-      name="WaterWave2DirY"
-      top_pad="6"
-      width="216" />
-
-<!--======== III conlumn of contorls ========-->
-
-	 <text
-      follows="left|top|right"
-      font="SansSerif"
-      height="16"
-      layout="topleft"
-      left_pad="20"
-      name="DensMultText"
-      top="5"
-      width="215">
-         Refract Scale Above
-     </text>
-     <slider
-      control_name="WaterScaleAbove"
-      decimal_digits="2"
-      follows="left|top"
-      increment="0.01"
-      initial_value="0.1"
-      layout="topleft"
-      left_delta="15"
-      name="WaterScaleAbove"
-      top_pad="5"
-      width="200" />
-     
-     <text
-      type="string"
-      length="1"
-      follows="left|top|right"
-      font="SansSerif"
-      height="16"
-      layout="topleft"
-      left_delta="-15"
-      name="WaterScaleBelowText"
-      top_pad="15"
-      width="215">
-         Refract Scale Below
-     </text>
-     <slider
-      control_name="WaterScaleBelow"
-      decimal_digits="2"
-      follows="left|top"
-      height="10"
-      increment="0.01"
-      initial_value="0"
-      layout="topleft"
-      left_delta="15"
-      name="WaterScaleBelow"
-      top_pad="5"
-      width="200"/>
-     
-     <text
-      follows="left|top|right"
-      font="SansSerif"
-      height="16"
-      layout="topleft"
-      left_delta="-15"
-      name="MaxAltText"
-      top_pad="15"
-      width="215">
-         Blur Multiplier
-     </text>
-     <slider
-      control_name="WaterBlurMult"
-      follows="left|top"
-      height="10"
-      increment="0.001"
-      initial_value="0"
-      layout="topleft"
-      left_delta="15"
-      max_val="0.16"
-      name="WaterBlurMult"
-      top_pad="5"
-      width="200"/>
-      
-      <text
-       follows="left|top|right"
-       font="SansSerif"
-       height="16"
-       layout="topleft"
-       left_delta="-15"
-       name="BHText3"
-       top_pad="15"
-       width="215">
-          Normal Map
-      </text>
-      <texture_picker
-       height="80"
-       layout="topleft"
-       left_delta="15"
-       name="WaterNormalMap"
-       top_pad="5"
-       width="100" />
-	</panel>
-<!--======== End of Controls panel ========-->	
-
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="0"
-     layout="topleft"
-     left="10"
-     name="horiz_separator"
-     top_pad="5"
-     width="700"/>
-	<check_box
-	 follows="top|left"
-	 height="10"
-	 label="Make this preset my new water setting"
-	 layout="topleft"
-	 left="275"
-	 name="make_default_cb"
-	 top_pad="20"
-	 width="280"/>
-	<button
-	 follows="bottom|right"
-	 height="23"
-	 label="Save"
-	 layout="topleft"
-	 left_pad="0"
-	 name="save"
-	 width="70"/>	 
-	<button
-	 follows="bottom|right"
-	 height="23"
-	 label="Cancel"
-	 layout="topleft"
-	 left_pad="15"
-	 name="cancel"
-	 width="70"/>
-	
- </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 458e127d41..730661c55b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -713,6 +713,8 @@
 	     	</menu_item_call>
 	     	
 	     	<menu_item_separator/>
+
+           <!-- *LAPRAS* These menus go away.  Keep till no longer needed -->
 	     	
 	     	<menu
 	     	 name="Water Presets"
@@ -732,7 +734,7 @@
 	     	 	 	parameter="edit_water"/>
 	     	 	</menu_item_call>
 	     	</menu>
-	     	
+
 	     	<menu
 	     	 name="Sky Presets"
 	     	 label="Sky Presets">
@@ -770,6 +772,7 @@
 	     	 	 	parameter="edit_day_cycle"/>
 	     	 	</menu_item_call>
 	     	</menu>
+        <!-- *LAPRAS* -->
 	    </menu>
     
     
-- 
cgit v1.2.3


From 28d0fa0c69cc5d45844f9f542d99d04bbded16ad Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 16 May 2018 20:25:42 +0300
Subject: MAINT-8344 Day cycle editor (part 2)

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  | 152 ++++++++++-----------
 .../default/xui/en/panel_settings_sky_atmos.xml    |   5 +-
 .../default/xui/en/panel_settings_sky_clouds.xml   |   3 +-
 .../default/xui/en/panel_settings_sky_sunmoon.xml  |   3 +-
 .../skins/default/xui/en/panel_settings_water.xml  |   3 +-
 5 files changed, 83 insertions(+), 83 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 70f5e21327..3b63d0018c 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -8,17 +8,13 @@
         title="Edit Day Cycle"
         width="705">
 
+    <!-- obsolete?, add as hint for 'save' button? -->
     <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>
-  
-    <!-- Todo: These 5 strings might be subjected to a change to get dynamic labels-->
-    <string name="0_label">0%[DSC]</string>
-    <string name="1_label">25%[DSC]</string>
-    <string name="2_label">50%[DSC]</string>
-    <string name="3_label">75%[DSC]</string>
-    <string name="4_label">100%[DSC]</string>
+
+    <!-- Todo: These 5 strings might be subjected to a change to get dynamic labels, consider using layout_stack to get dynamic width adjustment-->
     <string name="time_label"> ([TIME] hr)</string>
 
     <layout_stack name="test_stack"
@@ -90,7 +86,7 @@
                         width="100"> 
                     <button.commit_callback
                       function="DayCycle.Track"
-                      parameter="1" />
+                      parameter="4" />
                 </button>
                 <button
                         follows="left|top"
@@ -103,7 +99,7 @@
                         width="100"> 
                     <button.commit_callback
                       function="DayCycle.Track"
-                      parameter="2" />
+                      parameter="3" />
                 </button>
                 <button
                         follows="left|top"
@@ -116,7 +112,7 @@
                         width="100"> 
                     <button.commit_callback
                       function="DayCycle.Track"
-                      parameter="3" />
+                      parameter="2" />
                 </button>
                 <button
                         follows="left|top"
@@ -129,7 +125,7 @@
                         width="100"> 
                     <button.commit_callback
                       function="DayCycle.Track"
-                      parameter="4" />
+                      parameter="1" />
                 </button>
                 <button
                         follows="left|top"
@@ -156,104 +152,100 @@
                     min_width="595"
                     left_pad="0"
                     visible="true">              
-                        <text
+    <!-- Todo: These 5 tests might be subjected to a change to be dynamically generated, consider using layout_stack to get dynamic width adjustment-->
+                <text
                          follows="left|top"
                          height="15"
                          layout="topleft"
                          left="10"
                          name="p0"
                          top_pad="5"
-                         value="0%"
-                         width="50" />
-                        <text
+                         value="0%[DSC]"
+                         width="70" />
+                <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left_pad="69"
+                         left_pad="49"
                          name="p1"
                          top_delta="0"
-                         value="25%"
-                         width="50" />
-                        <text
+                         value="25%[DSC]"
+                         width="70" />
+                <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left_pad="69"
+                         left_pad="49"
                          name="p2"
                          top_delta="0"
-                         value="50%"
-                         width="50" />
-                        <text
+                         value="50%[DSC]"
+                         width="70" />
+                <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left_pad="69"
+                         left_pad="49"
                          name="p3"
                          top_delta="0"
-                         value="75%"
-                         width="50" />
-                        <text
+                         value="75%[DSC]"
+                         width="70" />
+                <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left_pad="69"
+                         left_pad="49"
                          name="p4"
                          top_delta="0"
-                         value="100%"
-                         width="50" />
-                  <multi_slider
+                         value="100%[DSC]"
+                         width="70" />
+                <multi_slider
                     can_edit_text="true"
                     decimal_digits="0"
                     draw_track="false"
                     follows="bottom"
                     height="10"
-                    increment="0.0833333"
+                    increment="0.01"
                     initial_value="0"
                     layout="topleft"
                     left="10"
-                    max_sliders="20"
-                    max_val="24"
+                    max_sliders="1"
+                    max_val="1"
                     name="WLTimeSlider"
                     show_text="false"
                     top_pad="0"
                     use_triangle="true"
                     width="525"
                     min_width="525"/>
-          
-                  <multi_slider
+
+                <multi_slider
                       can_edit_text="true"
                       decimal_digits="0"
                       follows="bottom"
                       height="10"
-                      increment="0.0833333"
+                      increment="0.01"
                       initial_value="0"
                       layout="topleft"
                       left="10"
                       max_sliders="20"
-                      max_val="24"
-                      name="WLDayCycleKeys"
+                      max_val="1"
+                      name="WLDayCycleFrames"
                       show_text="false"
                       top_pad="15"
                       width="525"
                       min_width="525" />
-              
-            <line_editor
-             border_style="line"
-             border_thickness="1"
-             follows="left|bottom"
-             font="SansSerif"
-             height="20"
-             layout="topleft"
-             left_pad="0"
-             max_length_bytes="300"
-             name="timeline_field"
-             select_on_focus="true"
-             value="%"
-             tool_tip="The full path to an editor (executable) to edit floater XML files (quotes not necessary)"
-             top_delta="-5"
-             width="35" />
 
-              <layout_stack
+                <text
+                      follows="left|bottom"
+                      height="20"
+                      layout="topleft"
+                      left_pad="0"
+                      name="current_time"
+                      select_on_focus="true"
+                      value="[PRCNT]%[DSC]"
+                      top_delta="-5"
+                      width="70" />
+
+                <layout_stack
                 name="progress_control"
                 follows="top|left"
                 height="25"
@@ -264,7 +256,7 @@
                 top_pad="40"
                 orientation="horizontal">
 
-                <layout_panel
+                    <layout_panel
                   name="skip_back"
                   mouse_opaque="false"
                   auto_resize="false"
@@ -273,7 +265,7 @@
                   height="25"
                   min_width="25"
                   width="25">
-                  <button
+                        <button
                     name="skip_back_btn"
                     follows="top"
                     image_overlay="SkipBackward_Off"
@@ -289,9 +281,9 @@
                     tool_tip="Step back"
                     top="0"
                     left="0"/>
-                </layout_panel>
+                    </layout_panel>
 
-                <layout_panel
+                    <layout_panel
                   name="play"
                   mouse_opaque="false"
                   auto_resize="false"
@@ -300,7 +292,7 @@
                   height="25"
                   min_width="25"
                   width="25">
-                  <button
+                        <button
                         name="play_btn"
                         follows="top"
                         image_overlay="Play_Off"
@@ -315,9 +307,9 @@
                         width="25"
                         left="0"
                         top="0" />
-                </layout_panel>
+                    </layout_panel>
 
-                <layout_panel
+                    <layout_panel
                   name="pause"
                   mouse_opaque="false"
                   auto_resize="false"
@@ -327,7 +319,7 @@
                   min_width="25"
                   width="25"
                   visible="false">
-                  <button
+                        <button
                         name="pause_btn"
                         follows="top"
                         image_overlay="Pause_Off"
@@ -342,9 +334,9 @@
                         width="25"
                         left="0"
                         top="0"/>
-                </layout_panel>
+                    </layout_panel>
 
-                <layout_panel
+                    <layout_panel
                   name="skip_forward"
                   mouse_opaque="false"
                   auto_resize="false"
@@ -353,7 +345,7 @@
                   height="25"
                   min_width="25"
                   width="25">
-                  <button
+                        <button
                     name="skip_forward_btn"
                     follows="top"
                     image_overlay="SkipForward_Off"
@@ -367,10 +359,10 @@
                     layout="topleft"
                     tool_tip="Step forward"
                     top="0" />
-                </layout_panel>
-              </layout_stack>
-              
-            <button
+                    </layout_panel>
+                </layout_stack>
+
+                <button
                     follows="top|left"
                     height="23"
                     width="90"
@@ -378,7 +370,7 @@
                     left_pad="175"
                     top_delta="-12"
                     name="add_frame" />
-            <button
+                <button
                     follows="left|top"
                     height="23"
                     width="90"
@@ -407,10 +399,11 @@
                     tab_padding_right="3"
                     top_pad="0"
                     width="700">
-                       <panel
+                <panel
                          border="true"
+                         class="panel_settings_water"
                          filename="panel_settings_water.xml"
-                         label="Water_panel"
+                         label="Water"
                          layout="topleft"
                          left_delta="0"
                          top_pad="5"
@@ -437,24 +430,27 @@
                     tab_padding_right="3"
                     top_pad="0"
                     width="700">
-                       <panel
+                <panel
                          border="true"
+                         class="panel_settings_atmos"
                          filename="panel_settings_sky_atmos.xml"
                          label="Atmosphere &amp; Lighting"
                          layout="topleft"
                          left_delta="0"
                          top_pad="5"
                          name="atmosphere_panel" />
-                       <panel
+                <panel
                          border="true"
+                         class="panel_settings_clouds"
                          filename="panel_settings_sky_clouds.xml"
                          label="Clouds"
                          layout="topleft"
                          left_delta="0"
                          top_pad="5"
                          name="clouds_panel" />
-                       <panel
+                <panel
                          border="true"
+                         class="panel_settings_sunmoon"
                          filename="panel_settings_sky_sunmoon.xml"
                          label="Sun &amp; Moon"
                          layout="topleft"
@@ -495,7 +491,7 @@
                     left_pad="10"
                     name="upload_btn"
                     width="100" /> 
-                    
+
         </layout_panel>
     </layout_stack>
 
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index ffa7df209b..8317196e75 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -7,12 +7,13 @@
         left="0"
         name="panel_settings_sky_atmos"
         top="0">
-    <layout_stack 
+    <layout_stack
+            follows="all"
+            layout="topleft"
             left="5"
             top="5"
             right="-5"
             bottom="-5"
-            follows="left|top|right|bottom"
             orientation="vertical">
         <layout_panel
                 border="true"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index b88ac64323..9bd931f9fb 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -9,11 +9,12 @@
         name="panel_settings_sky_clouds"
         top="0">
     <layout_stack 
+            follows="all"
+            layout="topleft"
             left="5"
             top="5"
             right="-5"
             bottom="-5"
-            follows="left|top|right|bottom"
             orientation="hoizontal">
         <layout_panel
                 border="true"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 0eb4e5be94..9e5df59daf 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -8,11 +8,12 @@
         name="panel_settings_sky_hbodies"
         top="0">
     <layout_stack 
+            follows="all"
+            layout="topleft"
             left="5"
             top="5"
             right="-5"
             bottom="-5"
-            follows="left|top|right|bottom"
             orientation="hoizontal">
         <layout_panel
                 border="true"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index eb4664616e..59184b0f95 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -9,11 +9,12 @@
         name="panel_settings_water"
         top="0">
     <layout_stack name="water_stack1"
+            follows="all"
+            layout="topleft"
             left="5"
             top="5"
             right="-5"
             bottom="-5"
-            follows="left|top|right|bottom"
             orientation="vertical">
         <layout_panel
                 border="true"
-- 
cgit v1.2.3


From e4973e0f92b524e7f9c2d10745f4c5e3a8557284 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 18 May 2018 21:09:42 +0300
Subject: MAINT-8344 Day Cycle Editor (part 3)

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  | 45 ++++++++++++++--------
 1 file changed, 28 insertions(+), 17 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 3b63d0018c..bab902001f 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -15,7 +15,7 @@
     <string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string>
 
     <!-- Todo: These 5 strings might be subjected to a change to get dynamic labels, consider using layout_stack to get dynamic width adjustment-->
-    <string name="time_label"> ([TIME] hr)</string>
+    <string name="time_label"> ([HH]:[MM])</string>
 
     <layout_stack name="test_stack"
             width="705"
@@ -58,23 +58,19 @@
                 bevel_style="in"
                 auto_resize="false"
                 user_resize="true"
-                bg_alpha_color="red"
                 height="150"
                 min_height="0"
-                visible="true"
-                background_visible="true">
+                visible="true">
             <panel name="timeline_layers"
                     border="false"
                     follows="left|top"
                     auto_resize="false"
                     user_resize="true"
-                    bg_alpha_color="yellow"
                     height="150"
                     width="110"
                     top_pad="0"
                     min_height="0"
-                    visible="true"
-                    background_visible="true">
+                    visible="true">
                 <button
                         follows="left|top"
                         height="23"
@@ -161,43 +157,43 @@
                          name="p0"
                          top_pad="5"
                          value="0%[DSC]"
-                         width="70" />
+                         width="80" />
                 <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left_pad="49"
+                         left_pad="39"
                          name="p1"
                          top_delta="0"
                          value="25%[DSC]"
-                         width="70" />
+                         width="80" />
                 <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left_pad="49"
+                         left_pad="39"
                          name="p2"
                          top_delta="0"
                          value="50%[DSC]"
-                         width="70" />
+                         width="80" />
                 <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left_pad="49"
+                         left_pad="39"
                          name="p3"
                          top_delta="0"
                          value="75%[DSC]"
-                         width="70" />
+                         width="80" />
                 <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left_pad="49"
+                         left_pad="39"
                          name="p4"
                          top_delta="0"
                          value="100%[DSC]"
-                         width="70" />
+                         width="80" />
                 <multi_slider
                     can_edit_text="true"
                     decimal_digits="0"
@@ -490,7 +486,22 @@
                     layout="topleft"
                     left_pad="10"
                     name="upload_btn"
-                    width="100" /> 
+                    width="100" />
+            
+            <!--<button
+                    follows="top|left"
+                    height="23"
+                    name="btn_flyout"
+                    label=""
+                    layout="topleft"
+                    left_pad="-20"
+                    top="0"
+                    image_selected="SegmentedBtn_Right_Selected_Press"
+                    image_unselected="SegmentedBtn_Right_Off"
+                    image_pressed="SegmentedBtn_Right_Press"
+                    image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+                    image_overlay="Arrow_Small_Up"
+                    width="20"/>-->
 
         </layout_panel>
     </layout_stack>
-- 
cgit v1.2.3


From b6ba9dd565b59e516571445e56f9dafe3bdf4061 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 22 May 2018 20:32:56 +0300
Subject: MAINT-8344 Day Cycle Editor (part 4, finalization)

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  | 35 +++++++++++-----------
 1 file changed, 18 insertions(+), 17 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index bab902001f..ad11bded6a 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -470,6 +470,22 @@
                     top_pad="0"
                     name="save_btn"
                     width="100" />
+
+            <button
+                    follows="top|left"
+                    height="23"
+                    name="btn_flyout"
+                    label=""
+                    layout="topleft"
+                    left_pad="-20"
+                    top="0"
+                    image_selected="SegmentedBtn_Right_Selected_Press"
+                    image_unselected="SegmentedBtn_Right_Off"
+                    image_pressed="SegmentedBtn_Right_Press"
+                    image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+                    image_overlay="Arrow_Small_Up"
+                    width="20"/>
+
             <button
                     follows="top|left"
                     height="23"
@@ -479,29 +495,14 @@
                     name="cancel_btn"
                     width="100" /> 
 
-            <button
+            <!--<button
                     follows="top|left"
                     height="23"
                     label="Upload"
                     layout="topleft"
                     left_pad="10"
                     name="upload_btn"
-                    width="100" />
-            
-            <!--<button
-                    follows="top|left"
-                    height="23"
-                    name="btn_flyout"
-                    label=""
-                    layout="topleft"
-                    left_pad="-20"
-                    top="0"
-                    image_selected="SegmentedBtn_Right_Selected_Press"
-                    image_unselected="SegmentedBtn_Right_Off"
-                    image_pressed="SegmentedBtn_Right_Press"
-                    image_pressed_selected="SegmentedBtn_Right_Selected_Press"
-                    image_overlay="Arrow_Small_Up"
-                    width="20"/>-->
+                    width="100" />-->
 
         </layout_panel>
     </layout_stack>
-- 
cgit v1.2.3


From 044b80e4e1a7b55f46e6f3b52c9cae6d9c6df3eb Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 22 May 2018 10:49:55 -0700
Subject: Manual blender for use in day editing dialog.

---
 indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml | 2 +-
 indra/newview/skins/default/xui/en/floater_fixedenvironment.xml   | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index bab902001f..3a3779e753 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -437,7 +437,7 @@
                          name="atmosphere_panel" />
                 <panel
                          border="true"
-                         class="panel_settings_clouds"
+                         class="panel_settings_cloud"
                          filename="panel_settings_sky_clouds.xml"
                          label="Clouds"
                          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index 38ce131dc2..f88618fb71 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -81,10 +81,6 @@
                     tab_width="120"
                     tab_padding_right="3">
                 <!-- Tabs inserted here in code -->
-                <!-- -->
-                <!-- -->
-
-                <!-- -->
             </tab_container>
         </layout_panel>
         <layout_panel name="button_panel"
-- 
cgit v1.2.3


From b29aa01056a1ea08d1d29dd610f6a1cd0aadcd9b Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 22 May 2018 16:54:04 -0700
Subject: Enable save/load/import for day edit.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index ba4e15e7db..c4de2cdaee 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -52,6 +52,16 @@
                     top="5"
                     width="200"
                     height="21" />
+            <button
+                    height="23"
+                    label="Import"
+                    follows="right|top"
+                    right="-10"
+                    font="SansSerif"
+                    top_delta="0"
+                    name="btn_import"
+                    tool_tip="Import legacy settings from disk." 
+                    width="96" />
         </layout_panel>
         <layout_panel name="timeline_track_selection"
                 border="false"
-- 
cgit v1.2.3


From c75eeab8391859e0819de0afbf9acc2293864f1e Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 23 May 2018 19:01:52 +0300
Subject: MAINT-8344 Day Cycle Editor (playing)

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  | 120 ++++++++++-----------
 1 file changed, 59 insertions(+), 61 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index c4de2cdaee..1b07d1aa27 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -47,7 +47,7 @@
                     follows="top|left"
                     layout="topleft"
                     left_pad="10"
-                    max_chars="100"
+                    max_length_bytes="100"
                     name="day_cycle_name"
                     top="5"
                     width="200"
@@ -74,8 +74,6 @@
             <panel name="timeline_layers"
                     border="false"
                     follows="left|top"
-                    auto_resize="false"
-                    user_resize="true"
                     height="150"
                     width="110"
                     top_pad="0"
@@ -150,8 +148,6 @@
             <panel name="timeline"
                     border="true"
                     follows="left|top"
-                    auto_resize="false"
-                    user_resize="true"
                     height="150"
                     min_height="0"
                     width="595"
@@ -205,7 +201,6 @@
                          value="100%[DSC]"
                          width="80" />
                 <multi_slider
-                    can_edit_text="true"
                     decimal_digits="0"
                     draw_track="false"
                     follows="bottom"
@@ -220,11 +215,9 @@
                     show_text="false"
                     top_pad="0"
                     use_triangle="true"
-                    width="525"
-                    min_width="525"/>
+                    width="525" />
 
                 <multi_slider
-                      can_edit_text="true"
                       decimal_digits="0"
                       follows="bottom"
                       height="10"
@@ -237,8 +230,7 @@
                       name="WLDayCycleFrames"
                       show_text="false"
                       top_pad="15"
-                      width="525"
-                      min_width="525" />
+                      width="525" />
 
                 <text
                       follows="left|bottom"
@@ -246,7 +238,6 @@
                       layout="topleft"
                       left_pad="0"
                       name="current_time"
-                      select_on_focus="true"
                       value="[PRCNT]%[DSC]"
                       top_delta="-5"
                       width="70" />
@@ -272,25 +263,29 @@
                   min_width="25"
                   width="25">
                         <button
-                    name="skip_back_btn"
-                    follows="top"
-                    image_overlay="SkipBackward_Off"
-                    image_disabled="PushButton_Disabled"
-                    image_disabled_selected="PushButton_Disabled"
-                    image_selected="PushButton_Selected"
-                    image_unselected="PushButton_Off"
-                    hover_glow_amount="0.15"
-                    auto_resize="false"
-                    width="25"
-                    height="25"
-                    layout="topleft"
-                    tool_tip="Step back"
-                    top="0"
-                    left="0"/>
+                         name="skip_back_btn"
+                         follows="top"
+                         image_overlay="SkipBackward_Off"
+                         image_disabled="PushButton_Disabled"
+                         image_disabled_selected="PushButton_Disabled"
+                         image_selected="PushButton_Selected"
+                         image_unselected="PushButton_Off"
+                         hover_glow_amount="0.15"
+                         auto_resize="false"
+                         width="25"
+                         height="25"
+                         layout="topleft"
+                         tool_tip="Step back"
+                         top="0"
+                         left="0">
+                            <button.commit_callback
+                                function="DayCycle.PlayActions"
+                                parameter="back" />
+                        </button>
                     </layout_panel>
 
                     <layout_panel
-                  name="play"
+                  name="play_layout"
                   mouse_opaque="false"
                   auto_resize="false"
                   layout="topleft"
@@ -312,11 +307,15 @@
                         height="25"
                         width="25"
                         left="0"
-                        top="0" />
+                        top="0">
+                            <button.commit_callback
+                                function="DayCycle.PlayActions"
+                                parameter="play" />
+                        </button>
                     </layout_panel>
 
                     <layout_panel
-                  name="pause"
+                  name="pause_layout"
                   mouse_opaque="false"
                   auto_resize="false"
                   layout="topleft"
@@ -339,32 +338,40 @@
                         height="25"
                         width="25"
                         left="0"
-                        top="0"/>
+                        top="0">
+                            <button.commit_callback
+                                function="DayCycle.PlayActions"
+                                parameter="pause" />
+                        </button>
                     </layout_panel>
 
                     <layout_panel
-                  name="skip_forward"
-                  mouse_opaque="false"
-                  auto_resize="false"
-                  layout="topleft"
-                  top="0"
-                  height="25"
-                  min_width="25"
-                  width="25">
+                     name="skip_forward"
+                     mouse_opaque="false"
+                     auto_resize="false"
+                     layout="topleft"
+                     top="0"
+                     height="25"
+                     min_width="25"
+                     width="25">
                         <button
-                    name="skip_forward_btn"
-                    follows="top"
-                    image_overlay="SkipForward_Off"
-                    image_disabled="PushButton_Disabled"
-                    image_disabled_selected="PushButton_Disabled"
-                    image_selected="PushButton_Selected"
-                    image_unselected="PushButton_Off"
-                    hover_glow_amount="0.15"
-                    width="25"
-                    height="25"
-                    layout="topleft"
-                    tool_tip="Step forward"
-                    top="0" />
+                         name="skip_forward_btn"
+                         follows="top"
+                         image_overlay="SkipForward_Off"
+                         image_disabled="PushButton_Disabled"
+                         image_disabled_selected="PushButton_Disabled"
+                         image_selected="PushButton_Selected"
+                         image_unselected="PushButton_Off"
+                         hover_glow_amount="0.15"
+                         width="25"
+                         height="25"
+                         layout="topleft"
+                         tool_tip="Step forward"
+                         top="0">
+                            <button.commit_callback
+                                function="DayCycle.PlayActions"
+                                parameter="forward" />
+                        </button>
                     </layout_panel>
                 </layout_stack>
 
@@ -505,15 +512,6 @@
                     name="cancel_btn"
                     width="100" /> 
 
-            <!--<button
-                    follows="top|left"
-                    height="23"
-                    label="Upload"
-                    layout="topleft"
-                    left_pad="10"
-                    name="upload_btn"
-                    width="100" />-->
-
         </layout_panel>
     </layout_stack>
 
-- 
cgit v1.2.3


From 2ddad24c4d5e64711cdbffd98e290d3da8e9714a Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 30 May 2018 17:08:28 -0700
Subject: Timeline behavior in day cycle edit.

---
 indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml | 2 +-
 indra/newview/skins/default/xui/en/menu_save_settings.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 1b07d1aa27..86c580f354 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -121,7 +121,7 @@
                 <button
                         follows="left|top"
                         height="23"
-                        label="Sky 1"
+                        label="Ground Level"
                         layout="topleft"
                         top_pad="0"
                         left="10"
diff --git a/indra/newview/skins/default/xui/en/menu_save_settings.xml b/indra/newview/skins/default/xui/en/menu_save_settings.xml
index fcdd711366..0d52d9b16e 100644
--- a/indra/newview/skins/default/xui/en/menu_save_settings.xml
+++ b/indra/newview/skins/default/xui/en/menu_save_settings.xml
@@ -21,7 +21,7 @@
     </menu_item_call>
     <menu_item_call
             name="apply_local"
-            label="Apply Locally">
+            label="Apply Only To Myself">
         <menu_item_call.on_click 
                 function="FlyoutCombo.Button.Action"
                 userdata="local" />
-- 
cgit v1.2.3


From 2a613d7363c4e91a7258d4f0ea3971db1569e788 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 1 Jun 2018 16:24:36 -0700
Subject: Rework preset loading and context menu from inventory.

---
 .../skins/default/xui/en/menu_inventory.xml        | 27 ++++++++++++++++++++++
 .../skins/default/xui/en/menu_save_settings.xml    |  4 ++--
 .../newview/skins/default/xui/en/notifications.xml |  9 ++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 29915788f1..edd1f42d92 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -862,6 +862,33 @@
         <menu_item_call.on_click
          function="Inventory.DoToSelected"
          parameter="take_off" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Settings Separator" />
+    <menu_item_call
+            name="Settings Apply Local"
+            layout="topleft"
+            label="Apply Only To Myself">
+        <menu_item_call.on_click 
+                function="Inventory.DoToSelected"
+                parameter="apply_settings_local" />
+    </menu_item_call>
+    <menu_item_call
+            name="Settings Apply Parcel"
+            layout="topleft"
+            label="Apply To Parcel">
+        <menu_item_call.on_click 
+                function="Inventory.DoToSelected"
+                parameter="apply_settings_parcel" />
+    </menu_item_call>
+    <menu_item_call
+            name="Settings Apply Region"
+            layout="topleft"
+            label="Apply To Region">
+        <menu_item_call.on_click 
+                function="Inventory.DoToSelected"
+                parameter="apply_settings_region" />
     </menu_item_call>
 	<menu_item_separator
 	 layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_save_settings.xml b/indra/newview/skins/default/xui/en/menu_save_settings.xml
index 0d52d9b16e..a72b02c593 100644
--- a/indra/newview/skins/default/xui/en/menu_save_settings.xml
+++ b/indra/newview/skins/default/xui/en/menu_save_settings.xml
@@ -28,14 +28,14 @@
     </menu_item_call>
     <menu_item_call
             name="apply_parcel"
-            label="Apply Parcel">
+            label="Apply To Parcel">
         <menu_item_call.on_click 
                 function="FlyoutCombo.Button.Action"
                 userdata="parcel" />
     </menu_item_call>
     <menu_item_call
             name="apply_region"
-            label="Apply Region">
+            label="Apply To Region">
         <menu_item_call.on_click 
                 function="FlyoutCombo.Button.Action"
                 userdata="region" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6aa6653f42..d7193c511f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11104,4 +11104,13 @@ Cannot create large prims that intersect other players.  Please re-try when othe
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="FailedToFindSettings"
+   persist="true"
+   type="alertmodal">
+Failed to find the settisgs named [DESC] in database.
+  <tag>fail</tag>
+  </notification>
+  
 </notifications>
-- 
cgit v1.2.3


From b06803225bff30e863ea18cae1d33f42a4fd937e Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 4 Jun 2018 16:50:13 -0700
Subject: Reconnect apply to region and parcel reconnected to interface.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d7193c511f..756b711c4c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11113,4 +11113,31 @@ Failed to find the settisgs named [DESC] in database.
   <tag>fail</tag>
   </notification>
   
+  <notification
+   icon="notify.tga"
+   name="FailedToLoadSettingsApply"
+   persist="true"
+   type="alertmodal">
+Unable to apply those settings to the environment.
+  <tag>fail</tag>
+  </notification>
+  
+  <notification
+   icon="notify.tga"
+   name="FailedToBuildSettingsDay"
+   persist="true"
+   type="alertmodal">
+Unable to apply those settings to the environment.
+  <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="NoEnvironmentSettings"
+   persist="true"
+   type="alertmodal">
+This Region does not support environmental settings.
+  <tag>fail</tag>
+  </notification>
+  
 </notifications>
-- 
cgit v1.2.3


From bff5049b9262e703c3ae583962552ea416212e8b Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 6 Jun 2018 17:10:58 -0700
Subject: Various editor fixes.  Start adding a settings picker.

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  | 528 +++++++++++----------
 .../default/xui/en/floater_settings_picker.xml     |  11 +
 2 files changed, 295 insertions(+), 244 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_settings_picker.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 86c580f354..a1140b2532 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -41,7 +41,7 @@
                     left="15"
                     top="5"
                     width="105">
-              Day Cycle Name:
+                Day Cycle Name:
             </text>
             <line_editor
                     follows="top|left"
@@ -89,8 +89,8 @@
                         name="sky4_track"
                         width="100"> 
                     <button.commit_callback
-                      function="DayCycle.Track"
-                      parameter="4" />
+                            function="DayCycle.Track"
+                            parameter="4" />
                 </button>
                 <button
                         follows="left|top"
@@ -102,8 +102,8 @@
                         name="sky3_track"
                         width="100"> 
                     <button.commit_callback
-                      function="DayCycle.Track"
-                      parameter="3" />
+                            function="DayCycle.Track"
+                            parameter="3" />
                 </button>
                 <button
                         follows="left|top"
@@ -115,8 +115,8 @@
                         name="sky2_track"
                         width="100"> 
                     <button.commit_callback
-                      function="DayCycle.Track"
-                      parameter="2" />
+                            function="DayCycle.Track"
+                            parameter="2" />
                 </button>
                 <button
                         follows="left|top"
@@ -128,8 +128,8 @@
                         name="sky1_track"
                         width="100"> 
                     <button.commit_callback
-                      function="DayCycle.Track"
-                      parameter="1" />
+                            function="DayCycle.Track"
+                            parameter="1" />
                 </button>
                 <button
                         follows="left|top"
@@ -141,8 +141,8 @@
                         name="water_track"
                         width="100"> 
                     <button.commit_callback
-                      function="DayCycle.Track"
-                      parameter="0" />
+                            function="DayCycle.Track"
+                            parameter="0" />
                 </button>
             </panel>
             <panel name="timeline"
@@ -154,249 +154,289 @@
                     min_width="595"
                     left_pad="0"
                     visible="true">              
-    <!-- Todo: These 5 tests might be subjected to a change to be dynamically generated, consider using layout_stack to get dynamic width adjustment-->
+                <!-- Todo: These 5 tests might be subjected to a change to be dynamically generated, consider using layout_stack to get dynamic width adjustment-->
                 <text
-                         follows="left|top"
-                         height="15"
-                         layout="topleft"
-                         left="10"
-                         name="p0"
-                         top_pad="5"
-                         value="0%[DSC]"
-                         width="80" />
+                        follows="left|top"
+                        height="15"
+                        layout="topleft"
+                        left="10"
+                        name="p0"
+                        top_pad="5"
+                        value="0%[DSC]"
+                        width="80" />
                 <text
-                         follows="left|top|right"
-                         height="15"
-                         layout="topleft"
-                         left_pad="39"
-                         name="p1"
-                         top_delta="0"
-                         value="25%[DSC]"
-                         width="80" />
+                        follows="left|top|right"
+                        height="15"
+                        layout="topleft"
+                        left_pad="39"
+                        name="p1"
+                        top_delta="0"
+                        value="25%[DSC]"
+                        width="80" />
                 <text
-                         follows="left|top|right"
-                         height="15"
-                         layout="topleft"
-                         left_pad="39"
-                         name="p2"
-                         top_delta="0"
-                         value="50%[DSC]"
-                         width="80" />
+                        follows="left|top|right"
+                        height="15"
+                        layout="topleft"
+                        left_pad="39"
+                        name="p2"
+                        top_delta="0"
+                        value="50%[DSC]"
+                        width="80" />
                 <text
-                         follows="left|top|right"
-                         height="15"
-                         layout="topleft"
-                         left_pad="39"
-                         name="p3"
-                         top_delta="0"
-                         value="75%[DSC]"
-                         width="80" />
+                        follows="left|top|right"
+                        height="15"
+                        layout="topleft"
+                        left_pad="39"
+                        name="p3"
+                        top_delta="0"
+                        value="75%[DSC]"
+                        width="80" />
                 <text
-                         follows="left|top|right"
-                         height="15"
-                         layout="topleft"
-                         left_pad="39"
-                         name="p4"
-                         top_delta="0"
-                         value="100%[DSC]"
-                         width="80" />
+                        follows="left|top|right"
+                        height="15"
+                        layout="topleft"
+                        left_pad="39"
+                        name="p4"
+                        top_delta="0"
+                        value="100%[DSC]"
+                        width="80" />
                 <multi_slider
-                    decimal_digits="0"
-                    draw_track="false"
-                    follows="bottom"
-                    height="10"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left="10"
-                    max_sliders="1"
-                    max_val="1"
-                    name="WLTimeSlider"
-                    show_text="false"
-                    top_pad="0"
-                    use_triangle="true"
-                    width="525" />
+                        decimal_digits="0"
+                        draw_track="false"
+                        follows="bottom"
+                        height="10"
+                        increment="0.01"
+                        initial_value="0"
+                        layout="topleft"
+                        left="10"
+                        max_sliders="1"
+                        max_val="1"
+                        name="WLTimeSlider"
+                        show_text="false"
+                        top_pad="0"
+                        use_triangle="true"
+                        width="525" />
 
                 <multi_slider
-                      decimal_digits="0"
-                      follows="bottom"
-                      height="10"
-                      increment="0.01"
-                      initial_value="0"
-                      layout="topleft"
-                      left="10"
-                      max_sliders="20"
-                      max_val="1"
-                      name="WLDayCycleFrames"
-                      show_text="false"
-                      top_pad="15"
-                      width="525" />
+                        decimal_digits="0"
+                        follows="bottom"
+                        height="10"
+                        increment="0.01"
+                        initial_value="0"
+                        layout="topleft"
+                        left="10"
+                        max_sliders="20"
+                        max_val="1"
+                        name="WLDayCycleFrames"
+                        show_text="false"
+                        top_pad="15"
+                        width="525" />
 
                 <text
-                      follows="left|bottom"
-                      height="20"
-                      layout="topleft"
-                      left_pad="0"
-                      name="current_time"
-                      value="[PRCNT]%[DSC]"
-                      top_delta="-5"
-                      width="70" />
+                        follows="left|bottom"
+                        height="20"
+                        layout="topleft"
+                        left_pad="0"
+                        name="current_time"
+                        value="[PRCNT]%[DSC]"
+                        top_delta="-5"
+                        width="70" />
 
                 <layout_stack
-                name="progress_control"
-                follows="top|left"
-                height="25"
-                width="83"
-                layout="topleft"
-                animate="false"
-                left="225"
-                top_pad="40"
-                orientation="horizontal">
+                        name="progress_control"
+                        follows="top|left"
+                        height="25"
+                        width="83"
+                        layout="topleft"
+                        animate="false"
+                        left="225"
+                        top_pad="40"
+                        orientation="horizontal">
 
                     <layout_panel
-                  name="skip_back"
-                  mouse_opaque="false"
-                  auto_resize="false"
-                  layout="topleft"
-                  top="0"
-                  height="25"
-                  min_width="25"
-                  width="25">
+                            name="skip_back"
+                            mouse_opaque="false"
+                            auto_resize="false"
+                            layout="topleft"
+                            top="0"
+                            height="25"
+                            min_width="25"
+                            width="25">
                         <button
-                         name="skip_back_btn"
-                         follows="top"
-                         image_overlay="SkipBackward_Off"
-                         image_disabled="PushButton_Disabled"
-                         image_disabled_selected="PushButton_Disabled"
-                         image_selected="PushButton_Selected"
-                         image_unselected="PushButton_Off"
-                         hover_glow_amount="0.15"
-                         auto_resize="false"
-                         width="25"
-                         height="25"
-                         layout="topleft"
-                         tool_tip="Step back"
-                         top="0"
-                         left="0">
+                                name="skip_back_btn"
+                                follows="top"
+                                image_overlay="SkipBackward_Off"
+                                image_disabled="PushButton_Disabled"
+                                image_disabled_selected="PushButton_Disabled"
+                                image_selected="PushButton_Selected"
+                                image_unselected="PushButton_Off"
+                                hover_glow_amount="0.15"
+                                auto_resize="false"
+                                width="25"
+                                height="25"
+                                layout="topleft"
+                                tool_tip="Step back"
+                                top="0"
+                                left="0">
                             <button.commit_callback
-                                function="DayCycle.PlayActions"
-                                parameter="back" />
+                                    function="DayCycle.PlayActions"
+                                    parameter="back" />
                         </button>
                     </layout_panel>
 
                     <layout_panel
-                  name="play_layout"
-                  mouse_opaque="false"
-                  auto_resize="false"
-                  layout="topleft"
-                  top="0"
-                  height="25"
-                  min_width="25"
-                  width="25">
+                            name="play_layout"
+                            mouse_opaque="false"
+                            auto_resize="false"
+                            layout="topleft"
+                            top="0"
+                            height="25"
+                            min_width="25"
+                            width="25">
                         <button
-                        name="play_btn"
-                        follows="top"
-                        image_overlay="Play_Off"
-                        image_disabled="PushButton_Disabled"
-                        image_disabled_selected="PushButton_Disabled"
-                        image_selected="PushButton_Selected"
-                        image_unselected="PushButton_Off"
-                        hover_glow_amount="0.15"
-                        auto_resize="false"
-                        layout="topleft"
-                        height="25"
-                        width="25"
-                        left="0"
-                        top="0">
+                                name="play_btn"
+                                follows="top"
+                                image_overlay="Play_Off"
+                                image_disabled="PushButton_Disabled"
+                                image_disabled_selected="PushButton_Disabled"
+                                image_selected="PushButton_Selected"
+                                image_unselected="PushButton_Off"
+                                hover_glow_amount="0.15"
+                                auto_resize="false"
+                                layout="topleft"
+                                height="25"
+                                width="25"
+                                left="0"
+                                top="0">
                             <button.commit_callback
-                                function="DayCycle.PlayActions"
-                                parameter="play" />
+                                    function="DayCycle.PlayActions"
+                                    parameter="play" />
                         </button>
                     </layout_panel>
 
                     <layout_panel
-                  name="pause_layout"
-                  mouse_opaque="false"
-                  auto_resize="false"
-                  layout="topleft"
-                  top="0"
-                  height="25"
-                  min_width="25"
-                  width="25"
-                  visible="false">
+                            name="pause_layout"
+                            mouse_opaque="false"
+                            auto_resize="false"
+                            layout="topleft"
+                            top="0"
+                            height="25"
+                            min_width="25"
+                            width="25"
+                            visible="false">
                         <button
-                        name="pause_btn"
-                        follows="top"
-                        image_overlay="Pause_Off"
-                        image_disabled="PushButton_Disabled"
-                        image_disabled_selected="PushButton_Disabled"
-                        image_selected="PushButton_Selected"
-                        image_unselected="PushButton_Off"
-                        hover_glow_amount="0.15"
-                        auto_resize="false"
-                        layout="topleft"
-                        height="25"
-                        width="25"
-                        left="0"
-                        top="0">
+                                name="pause_btn"
+                                follows="top"
+                                image_overlay="Pause_Off"
+                                image_disabled="PushButton_Disabled"
+                                image_disabled_selected="PushButton_Disabled"
+                                image_selected="PushButton_Selected"
+                                image_unselected="PushButton_Off"
+                                hover_glow_amount="0.15"
+                                auto_resize="false"
+                                layout="topleft"
+                                height="25"
+                                width="25"
+                                left="0"
+                                top="0">
                             <button.commit_callback
-                                function="DayCycle.PlayActions"
-                                parameter="pause" />
+                                    function="DayCycle.PlayActions"
+                                    parameter="pause" />
                         </button>
                     </layout_panel>
 
                     <layout_panel
-                     name="skip_forward"
-                     mouse_opaque="false"
-                     auto_resize="false"
-                     layout="topleft"
-                     top="0"
-                     height="25"
-                     min_width="25"
-                     width="25">
+                            name="skip_forward"
+                            mouse_opaque="false"
+                            auto_resize="false"
+                            layout="topleft"
+                            top="0"
+                            height="25"
+                            min_width="25"
+                            width="25">
                         <button
-                         name="skip_forward_btn"
-                         follows="top"
-                         image_overlay="SkipForward_Off"
-                         image_disabled="PushButton_Disabled"
-                         image_disabled_selected="PushButton_Disabled"
-                         image_selected="PushButton_Selected"
-                         image_unselected="PushButton_Off"
-                         hover_glow_amount="0.15"
-                         width="25"
-                         height="25"
-                         layout="topleft"
-                         tool_tip="Step forward"
-                         top="0">
+                                name="skip_forward_btn"
+                                follows="top"
+                                image_overlay="SkipForward_Off"
+                                image_disabled="PushButton_Disabled"
+                                image_disabled_selected="PushButton_Disabled"
+                                image_selected="PushButton_Selected"
+                                image_unselected="PushButton_Off"
+                                hover_glow_amount="0.15"
+                                width="25"
+                                height="25"
+                                layout="topleft"
+                                tool_tip="Step forward"
+                                top="0">
                             <button.commit_callback
-                                function="DayCycle.PlayActions"
-                                parameter="forward" />
+                                    function="DayCycle.PlayActions"
+                                    parameter="forward" />
                         </button>
                     </layout_panel>
                 </layout_stack>
 
                 <button
-                    follows="top|left"
-                    height="23"
-                    width="90"
-                    label="Add Frame"
-                    left_pad="175"
-                    top_delta="-12"
-                    name="add_frame" />
+                        follows="top|left"
+                        height="23"
+                        width="90"
+                        label="Add Frame"
+                        left_pad="175"
+                        top_delta="-12"
+                        name="add_frame" />
                 <button
-                    follows="left|top"
-                    height="23"
-                    width="90"
-                    label="Delete Frame"
-                    top_pad="0"
-                    left_delta="0"
-                    name="delete_frame" />
+                        follows="left|top"
+                        height="23"
+                        width="90"
+                        label="Delete Frame"
+                        top_pad="0"
+                        left_delta="0"
+                        name="delete_frame" />
             </panel>
         </layout_panel>
+        <layout_panel name="frame_edit_controls"
+                auto_resize="false"
+                user_resize="true"
+                height="30"
+                width="700"
+                min_height="30"
+                visible="true">
+            <!--bg_alpha_color="blue"
+                background_visible="true" -->
+            <icon 
+                    border="1"
+                    bevel_style="out"
+                    name="icn_lock_edit"
+                    layout="bottomleft"
+                    follows="bottom"
+                    image_name="Locked_Icon"
+                    bottom="4"
+                    left="5"
+                    height="15"
+                    width="15"
+                    tab_stop="false" 
+                    visible="false"
+                    tool_tip="Select a key frame above to edit settings"/>
+            <button
+                    name="btn_load_frame"
+                    follows="top"
+                    image_overlay="Command_Inventory_Icon"
+                    image_disabled="PushButton_Disabled"
+                    image_disabled_selected="PushButton_Disabled"
+                    image_selected="PushButton_Selected"
+                    image_unselected="PushButton_Off"
+                    hover_glow_amount="0.15"
+                    auto_resize="false"
+                    layout="topleft"
+                    height="30"
+                    width="30"
+                    left="25"
+                    top="1"
+                    tool_tip="Replace frame with settings from inventory"/>
+        </layout_panel>
         <layout_panel name="frame_settings_water"
                 auto_resize="false"
                 user_resize="true"
-                height="386"
+                height="351"
                 width="700"
                 min_height="0"
                 visible="false">
@@ -413,20 +453,20 @@
                     top_pad="0"
                     width="700">
                 <panel
-                         border="true"
-                         class="panel_settings_water"
-                         filename="panel_settings_water.xml"
-                         label="Water"
-                         layout="topleft"
-                         left_delta="0"
-                         top_pad="5"
-                         name="water_panel"/>
+                        border="true"
+                        class="panel_settings_water"
+                        filename="panel_settings_water.xml"
+                        label="Water"
+                        layout="topleft"
+                        left_delta="0"
+                        top_pad="5"
+                        name="water_panel"/>
             </tab_container>
         </layout_panel>
         <layout_panel name="frame_settings_sky"
                 auto_resize="false"
                 user_resize="true"
-                height="386"
+                height="351"
                 width="700"
                 min_height="0"
                 visible="true">
@@ -444,32 +484,32 @@
                     top_pad="0"
                     width="700">
                 <panel
-                         border="true"
-                         class="panel_settings_atmos"
-                         filename="panel_settings_sky_atmos.xml"
-                         label="Atmosphere &amp; Lighting"
-                         layout="topleft"
-                         left_delta="0"
-                         top_pad="5"
-                         name="atmosphere_panel" />
+                        border="true"
+                        class="panel_settings_atmos"
+                        filename="panel_settings_sky_atmos.xml"
+                        label="Atmosphere &amp; Lighting"
+                        layout="topleft"
+                        left_delta="0"
+                        top_pad="5"
+                        name="atmosphere_panel" />
                 <panel
-                         border="true"
-                         class="panel_settings_cloud"
-                         filename="panel_settings_sky_clouds.xml"
-                         label="Clouds"
-                         layout="topleft"
-                         left_delta="0"
-                         top_pad="5"
-                         name="clouds_panel" />
+                        border="true"
+                        class="panel_settings_cloud"
+                        filename="panel_settings_sky_clouds.xml"
+                        label="Clouds"
+                        layout="topleft"
+                        left_delta="0"
+                        top_pad="5"
+                        name="clouds_panel" />
                 <panel
-                         border="true"
-                         class="panel_settings_sunmoon"
-                         filename="panel_settings_sky_sunmoon.xml"
-                         label="Sun &amp; Moon"
-                         layout="topleft"
-                         left_delta="0"
-                         top_pad="5"
-                         name="moon_panel" />
+                        border="true"
+                        class="panel_settings_sunmoon"
+                        filename="panel_settings_sky_sunmoon.xml"
+                        label="Sun &amp; Moon"
+                        layout="topleft"
+                        left_delta="0"
+                        top_pad="5"
+                        name="moon_panel" />
             </tab_container>
         </layout_panel>
         <layout_panel name="buttons"
@@ -486,7 +526,7 @@
                     left="5"
                     top_pad="0"
                     name="save_btn"
-                    width="100" />
+                    width="150" />
 
             <button
                     follows="top|left"
@@ -510,7 +550,7 @@
                     layout="topleft"
                     left_pad="10"
                     name="cancel_btn"
-                    width="100" /> 
+                    width="150" /> 
 
         </layout_panel>
     </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
new file mode 100644
index 0000000000..75bef9f680
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+        height="602"
+        layout="topleft"
+        name="floater_settings_picker"
+        help_topic=""
+        save_rect="true"
+        title="Settings Selector"
+        width="705">
+        
+</floater>
-- 
cgit v1.2.3


From 8365945f8af6e27e7180b40aae79f210f99bb7c8 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 8 Jun 2018 16:40:01 -0700
Subject: Settings inventory picker.

---
 .../default/xui/en/floater_settings_picker.xml     | 118 +++++++++++++++++++--
 1 file changed, 111 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 75bef9f680..2df52ec6d5 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -1,11 +1,115 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-        height="602"
+        legacy_header_height="18"
+        can_minimize="false"
+        can_resize="true"
+        height="330"
         layout="topleft"
-        name="floater_settings_picker"
-        help_topic=""
-        save_rect="true"
-        title="Settings Selector"
-        width="705">
-        
+        min_height="330"
+        min_width="225"
+        name="settings picker"
+        help_topic="settings_picker"
+        title="PICK: SETTINGS"
+        width="225">
+
+    <!--  top static -->
+    <floater.string
+            name="choose_picture">
+        Click to choose a picture
+    </floater.string>
+    <floater.string
+            name="pick title">
+        Pick:
+    </floater.string>
+
+    <layout_stack name="test_stack"
+            follows="all"
+            animate="false"
+            top="20"
+            left="6"
+            right="-6"
+            bottom="-10"
+            auto_resize="true"
+            user_resize="true"
+            orientation="vertical">
+        <layout_panel name="temp"
+                border="false"
+                auto_resize="true"
+                user_resize="true"
+                height="29"
+                min_height="29"
+                bg_alpha_color="blue"
+                background_visible="false">
+            <filter_editor
+                    follows="left|top|right"
+                    height="23"
+                    label="Filter Textures"
+                    layout="topleft"
+                    left="4"
+                    name="flt_inventory_search"
+                    top="4"
+                    right="-2" />
+            <inventory_panel
+                    allow_multi_select="false"
+                    bg_visible="true"
+                    bg_alpha_color="DkGray2"
+                    border="false"
+                    follows="left|top|right|bottom"
+                    left_delta="0"
+                    name="pnl_inventory"
+                    top="31"
+                    right="-4"
+                    bottom="-26"
+                     /> 
+            <check_box
+                    follows="left|bottom"
+                    height="14"
+                    initial_value="false"
+                    label="Show folders"
+                    layout="topleft"
+                    name="chk_showfolders"
+                    top="-20"
+                    top_pad="0"
+                    left_delta="-3"
+                    width="200" />
+        </layout_panel>
+        <layout_panel name="temp"
+                border="false"
+                auto_resize="false"
+                user_resize="false"
+                height="29"
+                min_height="29">
+            <!--                bg_alpha_color="red"
+                background_visible="true" -->
+            <button
+                    follows="top|left"
+                    height="20"
+                    label="OK"
+                    label_selected="OK"
+                    layout="topleft"
+                    left="2"
+                    top="2"
+                    name="btn_select"
+                    width="100" />
+            <button
+                    follows="top|left"
+                    height="20"
+                    label="Cancel"
+                    label_selected="Cancel"
+                    layout="topleft"
+                    left_delta="110"
+                    top_delta="0"
+                    name="btn_cancel"
+                    width="100" />
+        </layout_panel>
+    </layout_stack>
+
+    <!--  middle: inventory mode -->
+    <!--
+
+
+-->     
+    <!-- bottom static -->
+    <!--
+     -->
 </floater>
-- 
cgit v1.2.3


From 97da85de0b1e0f8c2fc60c156c31b237b869230a Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 11 Jun 2018 11:43:50 -0700
Subject: remove legacy environmental edit floater and some lingering
 transition functions. Change floater environment switch behavior.

---
 .../xui/en/floater_environment_settings.xml        | 162 ---------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |   7 +-
 2 files changed, 2 insertions(+), 167 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_environment_settings.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
deleted file mode 100644
index 1b1cafaca6..0000000000
--- a/indra/newview/skins/default/xui/en/floater_environment_settings.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="328"
- layout="topleft"
- name="Environment Editor Floater"
- help_topic="environment_editor_floater"
- save_rect="true"
- 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>
-
- <view_border
-  bevel_style="none"  
-  follows="top|left"
-  height="237"
-  layout="topleft"
-  left="20"
-  name="border"
-  top_pad="8"
-  width="500"/>  
- <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 region settings"
-  	 layout="topleft"
-  	 name="use_region_settings"/>
-    <radio_item
-  	 label="Customize my environment"
-  	 layout="topleft"
-  	 name="use_my_settings"
-  	 top_pad="20"/>
-  </radio_group>
-
- <panel
-  height="170"
-  layout="topleft"
-  left="50"
-  name="user_environment_settings"
-  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"
-  follows="top|left"
-  height="16"
-  layout="topleft"
-  left="50"
-  top="40"
-  width="200">
-  		Water Setting
-  </text>
-  <combo_box
-   follows="top|left"
-   left_pad="2"
-   name="water_settings_preset_combo"
-   top_delta="-5"
-   width="200">
-      <combo_box.item
-       label="-Select a preset-"
-       name="item0"/>
-  </combo_box>
- 
-
- <!-- Sky/Day Cycle Settings -->  
- <text
-  name="sky_dayc_settings_title"
-  follows="top|left"
-  height="16"
-  layout="topleft"
-  left="50"
-  top_pad="20"
-  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="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"/>
-  </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="OK"
-   layout="topleft"
-   right="-130"
-   name="ok_btn"
-   top_pad="10"
-   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 578f1c56ff..90fc06aeb6 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -697,7 +697,7 @@
             </menu_item_check>
         </menu>
 	    
-   
+<!--   
 	    <menu
 	     create_jump_keys="true"
 	     label="Environment Editor"
@@ -714,8 +714,6 @@
 	     	
 	     	<menu_item_separator/>
 
-           <!-- *LAPRAS* These menus go away.  Keep till no longer needed -->
-	     	
 	     	<menu
 	     	 name="Water Presets"
 	     	 label="Water Presets">
@@ -772,9 +770,8 @@
 	     	 	 	parameter="edit_day_cycle"/>
 	     	 	</menu_item_call>
 	     	</menu>
-        <!-- *LAPRAS* -->
 	    </menu>
-    
+-->    
     
     </menu>
     <menu
-- 
cgit v1.2.3


From 8b3957b310afa23e543c3eb33aca9131dba52b31 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Thu, 7 Jun 2018 20:22:20 +0300
Subject: MAINT-8331 EEP UI control: XYVector

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  |  11 +-
 .../default/xui/en/panel_settings_sky_clouds.xml   |  53 +++------
 .../skins/default/xui/en/panel_settings_water.xml  | 118 ++++++---------------
 .../skins/default/xui/en/widgets/xy_vector.xml     |  29 +++++
 4 files changed, 81 insertions(+), 130 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/xy_vector.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index a1140b2532..fdd00ca910 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -6,7 +6,8 @@
         help_topic="day_presets"
         save_rect="true"
         title="Edit Day Cycle"
-        width="705">
+        width="705"
+        can_resize="true">
 
     <!-- obsolete?, add as hint for 'save' button? -->
     <string name="title_new">Create a New Day Cycle</string>
@@ -434,16 +435,16 @@
                     tool_tip="Replace frame with settings from inventory"/>
         </layout_panel>
         <layout_panel name="frame_settings_water"
-                auto_resize="false"
+                auto_resize="true"
                 user_resize="true"
-                height="351"
+                height="450"
                 width="700"
                 min_height="0"
                 visible="false">
             <tab_container
                     follows="all"
                     halign="left"
-                    height="386"
+                    height="420"
                     layout="topleft"
                     left="0"
                     name="water_tabs"
@@ -466,7 +467,7 @@
         <layout_panel name="frame_settings_sky"
                 auto_resize="false"
                 user_resize="true"
-                height="351"
+                height="450"
                 width="700"
                 min_height="0"
                 visible="true">
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 9bd931f9fb..57658a4725 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -95,51 +95,24 @@
                     width="200">
                 Cloud Scroll:
             </text>
-            <panel
+            <xy_vector
                     follows="left|top"
-                    border="true"
-                    bg_alpha_color="red"
-                    background_visible="true"
-                    width="100"
-                    height="100"
-                    left_delta="5"
-                    top_delta="21">
-                <text>
-                    placeholder
-                </text>
-                <slider
-                        decimal_digits="1"
-                        follows="left|top"
-                        increment="0.01"
-                        initial_value="0"
-                        layout="topleft"
-                        label="X:"
-                        left_delta="10"
-                        max_val="10"
-                        min_val="-10"
-                        name="cloud_scroll_x"
-                        top_pad="5"
-                        width="100"/>
-                <slider
-                        decimal_digits="1"
-                        follows="left|top"
-                        increment="0.01"
-                        initial_value="0"
-                        layout="topleft"
-                        label="Y:"
-                        left_delta="0"
-                        max_val="10"
-                        min_val="-10"
-                        name="cloud_scroll_y"
-                        top_pad="5"
-                        orientation="vertical" 
-                        height="70"/>
-            </panel>
+                    name="cloud_scroll_xy"
+                    width="120"
+                    height="145"
+                    visible="true"
+                    left_delta="0"
+                    top_delta="21"
+                    min_val_x="-10"
+                    max_val_x="10"
+                    min_val_y="-10"
+                    max_val_y="10" />
+
             <text
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="115"
+                    left_delta="160"
                     top_delta="-20"
                     width="200">
                 Cloud Image:
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 59184b0f95..85d636d107 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -7,7 +7,7 @@
         left="0"
         help_topic="land_general_tab"
         name="panel_settings_water"
-        top="0">
+        top="0">    
     <layout_stack name="water_stack1"
             follows="all"
             layout="topleft"
@@ -109,7 +109,7 @@
                         auto_resize="true"
                         user_resize="true"
                         visible="true"
-                        min_width="375"
+                        min_width="460"
                         width="50">
                     <text
                             follows="left|top"
@@ -143,98 +143,46 @@
                             height="16"
                             layout="topleft"
                             top_delta="-20"
-                            left_delta="120">
+                            left_delta="130">
                         Large Wave Speed
                     </text>
-                    <panel
-                            follows="left|top"
-                            border="true"
-                            bg_alpha_color="red"
-                            background_visible="true"
-                            width="100"
-                            height="100"
-                            left_delta="0"
-                            top_delta="21">
-                        <text>
-                            placeholder
-                        </text>
-                        <slider
-                                decimal_digits="1"
-                                follows="left|top"
-                                increment="0.01"
-                                initial_value="0"
-                                layout="topleft"
-                                label="X:"
-                                left_delta="10"
-                                max_val="4"
-                                min_val="-4"
-                                name="water_wave1_x"
-                                top_pad="5"
-                                width="100"/>
-                        <slider
-                                decimal_digits="1"
-                                follows="left|top"
-                                increment="0.01"
-                                initial_value="0"
-                                layout="topleft"
-                                label="Y:"
-                                left_delta="0"
-                                max_val="4"
-                                min_val="-4"
-                                name="water_wave1_y"
-                                top_pad="5"
-                                orientation="vertical" 
-                                height="70"/>
-                    </panel>
+                    <xy_vector
+                        follows="top|left"
+                        name="water_wave1_xy"
+                        width="120"
+                        height="145"
+                        visible="true"
+                        left_delta="0"
+                        top_delta="21"
+                        min_val_x="-4"
+                        max_val_x="4"
+                        increment_x="0.5f"
+                        min_val_y="-4"
+                        max_val_y="4"
+                        increment_y="0.5f"
+                        arrow_color="red"/>
+                    
                     <text
                             follows="left|top"
                             height="16"
                             layout="topleft"
                             top_delta="-20"
-                            left_delta="120">
+                            left_delta="160">
                         Small Wave Speed
                     </text>
-                    <panel
-                            follows="left|top"
-                            border="true"
-                            bg_alpha_color="red"
-                            background_visible="true"
-                            width="100"
-                            height="100"
-                            left_delta="0"
-                            top_delta="21"
-                            >
-                        <text>
-                            placeholder
-                        </text>
-                        <slider
-                                decimal_digits="1"
-                                follows="left|top"
-                                increment="0.01"
-                                initial_value="0"
-                                layout="topleft"
-                                label="X:"
-                                left_delta="10"
-                                max_val="4"
-                                min_val="-4"
-                                name="water_wave2_x"
-                                top_pad="5"
-                                width="100"/>
-                        <slider
-                                decimal_digits="1"
-                                follows="left|top"
-                                increment="0.01"
-                                initial_value="0"
-                                layout="topleft"
-                                label="Y:"
-                                left_delta="0"
-                                max_val="4"
-                                min_val="-4"
-                                name="water_wave2_y"
-                                top_pad="5"
-                                orientation="vertical" 
-                                height="70"/>
-                    </panel>
+                    <xy_vector
+                        follows="top|left"
+                        name="water_wave2_xy"
+                        width="120"
+                        height="145"
+                        visible="true"
+                        left_delta="0"
+                        top_delta="21"
+                        min_val_x="-4"
+                        max_val_x="4"
+                        min_val_y="-4"
+                        max_val_y="4" 
+                        arrow_color="green"/>
 
                     <text
                             follows="left|top|right"
diff --git a/indra/newview/skins/default/xui/en/widgets/xy_vector.xml b/indra/newview/skins/default/xui/en/widgets/xy_vector.xml
new file mode 100644
index 0000000000..93ae26a6ad
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/xy_vector.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xy_vector
+    name="xyvector"
+    width="120"
+    height="140"
+    decimal_digits="1"
+    label_width="16"
+    padding="4"
+    edit_bar_height="18"
+    user_resize="false">
+    
+    <xy_vector.border
+        visible="true"/>
+
+    <xy_vector.x_entry
+        name="XEntry"
+        tab_stop="true"
+        label="X:"/>
+    <xy_vector.y_entry
+        name="YEntry"
+        tab_stop="true"
+        label="Y:"/>
+    
+    <xy_vector.touch_area
+        name="TouchArea"
+        bevel_style="in"
+        border_visible="true"/>
+
+</xy_vector>
-- 
cgit v1.2.3


From b94df67b1f349d77cb108fe169c94d873a193099 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 21 Jun 2018 16:49:47 -0700
Subject: Editor layout revisions.

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  |   4 +-
 .../default/xui/en/panel_settings_sky_atmos.xml    |  30 ++--
 .../default/xui/en/panel_settings_sky_clouds.xml   |  40 +++---
 .../default/xui/en/panel_settings_sky_sunmoon.xml  |  15 +-
 .../skins/default/xui/en/panel_settings_water.xml  | 151 +++++++++++----------
 5 files changed, 132 insertions(+), 108 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index fdd00ca910..b03a7037a6 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -440,7 +440,7 @@
                 height="450"
                 width="700"
                 min_height="0"
-                visible="false">
+                visible="true">
             <tab_container
                     follows="all"
                     halign="left"
@@ -470,7 +470,7 @@
                 height="450"
                 width="700"
                 min_height="0"
-                visible="true">
+                visible="false">
             <tab_container
                     follows="all"
                     halign="left"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 8317196e75..7a21d69ed4 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -113,7 +113,7 @@
                     <slider
                             decimal_digits="2"
                             follows="left|top"
-                            height="10"
+                            height="16"
                             increment="0.01"
                             initial_value="0"
                             layout="topleft"
@@ -122,7 +122,8 @@
                             max_val="1"
                             name="haze_horizon"
                             top_delta="20"
-                            width="200"/>
+                            width="207"
+                            can_edit_text="true"/>
                     <text
                             follows="left|top"
                             height="10"
@@ -135,7 +136,7 @@
                     <slider
                             decimal_digits="2"
                             follows="left|top"
-                            height="10"
+                            height="16"
                             increment="0.01"
                             initial_value="0"
                             layout="topleft"
@@ -144,7 +145,8 @@
                             max_val="1"
                             name="haze_density"
                             top_delta="20"
-                            width="200"/>
+                            width="207"
+                            can_edit_text="true"/>
                     <text
                             follows="left|top"
                             height="10"
@@ -157,7 +159,7 @@
                     <slider
                             decimal_digits="2"
                             follows="left|top"
-                            height="10"
+                            height="16"
                             increment="0.01"
                             initial_value="0"
                             layout="topleft"
@@ -165,7 +167,8 @@
                             max_val="10"
                             name="scene_gamma"
                             top_delta="20"
-                            width="207"/>
+                            width="214"
+                            can_edit_text="true"/>
                 </layout_panel>            
                 <layout_panel
                         border="false"
@@ -186,7 +189,7 @@
                     <slider
                             decimal_digits="2"
                             follows="left|top"
-                            height="10"
+                            height="16"
                             increment="0.01"
                             initial_value="0"
                             layout="topleft"
@@ -195,7 +198,8 @@
                             max_val="0.9"
                             name="density_multip"
                             top_delta="20"
-                            width="200"/>
+                            width="207"
+                            can_edit_text="true"/>
                     <text
                             follows="left|top"
                             height="10"
@@ -208,7 +212,7 @@
                     <slider
                             decimal_digits="2"
                             follows="left|top"
-                            height="10"
+                            height="16"
                             increment="0.01"
                             initial_value="0"
                             layout="topleft"
@@ -217,7 +221,8 @@
                             max_val="100"
                             name="distance_multip"
                             top_delta="20"
-                            width="214"/>
+                            width="219"
+                            can_edit_text="true"/>
                     <text
                             follows="left|top"
                             height="10"
@@ -230,7 +235,7 @@
                     <slider
                             decimal_digits="1"
                             follows="left|top"
-                            height="10"
+                            height="16"
                             increment="0.01"
                             initial_value="0"
                             layout="topleft"
@@ -239,7 +244,8 @@
                             max_val="4000"
                             name="max_alt"
                             top_delta="20"
-                            width="214"/>
+                            width="219"
+                            can_edit_text="true"/>
                 </layout_panel>            
             </layout_stack>                
         </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 57658a4725..b4c3089942 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -54,7 +54,7 @@
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="10"
+                    height="16"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -63,7 +63,8 @@
                     max_val="1"
                     name="cloud_coverage"
                     top_delta="20"
-                    width="214"/>
+                    width="214"
+                    can_edit_text="true"/>
             <text
                     follows="left|top"
                     height="10"
@@ -76,7 +77,7 @@
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="10"
+                    height="16"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -85,7 +86,8 @@
                     max_val="1"
                     name="cloud_scale"
                     top_delta="20"
-                    width="214"/>
+                    width="214"
+                    can_edit_text="true"/>
             <text
                     follows="left|top"
                     height="10"
@@ -145,7 +147,7 @@
                     label="X"
                     decimal_digits="2"
                     follows="left|top"
-                    height="10"
+                    height="16"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -154,12 +156,13 @@
                     max_val="1"
                     name="cloud_density_x"
                     top_delta="20"
-                    width="200"/>
+                    width="200"
+                    can_edit_text="true"/>
             <slider
                     label="Y"
                     decimal_digits="2"
                     follows="left|top"
-                    height="10"
+                    height="16"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -168,12 +171,13 @@
                     max_val="1"
                     name="cloud_density_y"
                     top_delta="20"
-                    width="200"/>
+                    width="200"
+                    can_edit_text="true"/>
             <slider
                     label="D"
                     decimal_digits="2"
                     follows="left|top"
-                    height="10"
+                    height="16"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -182,7 +186,8 @@
                     max_val="1"
                     name="cloud_density_d"
                     top_delta="20"
-                    width="200"/>
+                    width="200"
+                    can_edit_text="true"/>
             <text
                     follows="left|top"
                     height="10"
@@ -196,7 +201,7 @@
                     label="X"
                     decimal_digits="2"
                     follows="left|top"
-                    height="10"
+                    height="16"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -205,12 +210,13 @@
                     max_val="1"
                     name="cloud_detail_x"
                     top_delta="20"
-                    width="200"/>
+                    width="200"
+                    can_edit_text="true"/>
             <slider
                     label="Y"
                     decimal_digits="2"
                     follows="left|top"
-                    height="10"
+                    height="16"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -219,12 +225,13 @@
                     max_val="1"
                     name="cloud_detail_y"
                     top_delta="20"
-                    width="200"/>
+                    width="200"
+                    can_edit_text="true"/>
             <slider
                     label="D"
                     decimal_digits="2"
                     follows="left|top"
-                    height="10"
+                    height="16"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -233,7 +240,8 @@
                     max_val="1"
                     name="cloud_detail_d"
                     top_delta="20"
-                    width="200"/>
+                    width="200"
+                    can_edit_text="true"/>
         </layout_panel>
     </layout_stack>
 </panel>                
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 9e5df59daf..1323ad6a17 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -53,7 +53,7 @@
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="10"
+                    height="16"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -62,7 +62,8 @@
                     max_val="0.5"
                     name="glow_focus"
                     top_delta="20"
-                    width="200"/>
+                    width="200"
+                    can_edit_text="true"/>
             <text
                     follows="left|top"
                     height="10"
@@ -75,7 +76,7 @@
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="10"
+                    height="16"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -84,7 +85,8 @@
                     max_val="1.99"
                     name="glow_size"
                     top_delta="20"
-                    width="200"/>
+                    width="200"
+                    can_edit_text="true"/>
             <text
                     follows="left|top"
                     height="10"
@@ -97,7 +99,7 @@
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="10"
+                    height="16"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -106,7 +108,8 @@
                     max_val="2"
                     name="star_brightness"
                     top_delta="20"
-                    width="200"/>
+                    width="200"
+                    can_edit_text="true"/>
         </layout_panel>
         <layout_panel
                 border="false"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 85d636d107..c24a2dbbb6 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -57,13 +57,13 @@
                     height="10"
                     top_delta="-15"
                     left_delta="80"
-                    width="200">
+                    width="150">
                 Density Exponent:
             </text>
             <slider
                     decimal_digits="1"
                     follows="left|top|right"
-                    height="10"
+                    height="16"
                     increment="0.01"
                     initial_value="0"
                     layout="top"
@@ -71,18 +71,19 @@
                     max_val="10"
                     name="water_fog_density"
                     top_delta="5"
-                    width="200"/>
+                    width="150"
+                    can_edit_text="true"/>
             <text
                     follows="left|top"
                     height="10"
                     top_delta="25"
                     left_delta="-15"
-                    width="200">
+                    width="150">
                 Underwater Modifier:</text>
             <slider
                     decimal_digits="1"
                     follows="left|top|right"
-                    height="10"
+                    height="16"
                     increment="0.01"
                     initial_value="0"
                     layout="top"
@@ -90,7 +91,52 @@
                     max_val="10"
                     name="water_underwater_mod"
                     top_delta="20"
-                    width="200"/>
+                    width="150"
+                    can_edit_text="true"/>
+                    
+                    <text
+                            follows="left|top|right"
+                            height="10"
+                            layout="topleft"
+                            left_delta="165"
+                            top_delta="-53"
+                            width="150">
+                        Fresnel Scale:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0.7"
+                            layout="topleft"
+                            left_delta="5"
+                            name="water_fresnel_scale"
+                            top_delta="15"
+                            width="150"
+                            can_edit_text="true"/>
+                    <text
+                            follows="left|top|right"
+                            layout="topleft"
+                            left_delta="-5"
+                            name="FresnelOffsetText"
+                            top_delta="25"
+                            width="150">
+                        Fresnel Offset:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top|right"
+                            increment="0.01"
+                            initial_value="0.7"
+                            height="16"
+                            layout="topleft"
+                            left_delta="5"
+                            name="water_fresnel_offset"
+                            top_pad="5"
+                            width="150"
+                            can_edit_text="true"/>
+                    
         </layout_panel>
         <layout_panel
                 auto_resize="true"
@@ -111,39 +157,29 @@
                         visible="true"
                         min_width="460"
                         width="50">
-                    <text
-                            follows="left|top"
-                            height="20"
-                            font="SansSerif"
-                            layout="topleft"
-                            left="5"
-                            top="5"
-                            width="215">
-                        Waves:
-                    </text>
                     <text
                             follows="left|top|right"
                             height="16"
                             layout="topleft"
                             left="15"
-                            top_delta="20"
+                            top="5"
                             width="215">
                         Normal Map
                     </text>
                     <texture_picker
-                            height="100"
+                            height="75"
                             layout="topleft"
                             left_delta="0"
                             name="water_normal_map"
                             top_pad="5"
-                            width="100"/>
+                            width="75"/>
 
                     <text
                             follows="left|top"
                             height="16"
                             layout="topleft"
                             top_delta="-20"
-                            left_delta="130">
+                            left_delta="175">
                         Large Wave Speed
                     </text>
                     <xy_vector
@@ -167,7 +203,7 @@
                             height="16"
                             layout="topleft"
                             top_delta="-20"
-                            left_delta="160">
+                            left_delta="140">
                         Small Wave Speed
                     </text>
                     <xy_vector
@@ -188,8 +224,8 @@
                             follows="left|top|right"
                             height="16"
                             layout="topleft"
-                            left="15"
-                            top_pad="10"
+                            left="10"
+                            top="90"
                             width="215">
                         Reflection Wavelet Scale
                     </text>
@@ -197,6 +233,7 @@
                             decimal_digits="1"
                             follows="left|top"
                             increment="0.01"
+                            height="16"
                             initial_value="0.7"
                             layout="topleft"
                             label="X:"
@@ -204,69 +241,35 @@
                             max_val="10"
                             name="water_normal_scale_x"
                             top_pad="5"
-                            width="150"/>
+                            width="150"
+                            can_edit_text="true"/>
                     <slider
                             decimal_digits="1"
                             follows="left|top"
                             increment="0.01"
                             initial_value="0.7"
+                            height="16"
                             layout="topleft"
                             max_val="10"
                             name="water_normal_scale_y"
                             top_pad="6"
                             label="Y:"
-                            width="150"/>
+                            width="150"
+                            can_edit_text="true"/>
                     <slider
                             decimal_digits="1"
                             follows="left|top"
                             increment="0.01"
                             initial_value="0.7"
+                            height="16"
                             layout="topleft"
                             max_val="10"
                             name="water_normal_scale_z"
                             top_pad="6"
                             label="Z:"
-                            width="150"/>
-
-                    <text
-                            follows="left|top|right"
-                            height="16"
-                            layout="topleft"
-                            left_delta="175"
-                            top_delta="-52"
-                            width="150">
-                        Fresnel Scale:
-                    </text>
-                    <slider
-                            decimal_digits="2"
-                            follows="left|top"
-                            height="10"
-                            increment="0.01"
-                            initial_value="0.7"
-                            layout="topleft"
-                            left_delta="5"
-                            name="water_fresnel_scale"
-                            top_pad="5"
-                            width="150"/>
-                    <text
-                            follows="left|top|right"
-                            layout="topleft"
-                            left_delta="-5"
-                            name="FresnelOffsetText"
-                            top_pad="10"
-                            width="150">
-                        Fresnel Offset:
-                    </text>
-                    <slider
-                            decimal_digits="2"
-                            follows="left|top|right"
-                            increment="0.01"
-                            initial_value="0.7"
-                            layout="topleft"
-                            left_delta="5"
-                            name="water_fresnel_offset"
-                            top_pad="5"
-                            width="150"/>
+                            width="150"
+                            can_edit_text="true"/>                            
+                        
                 </layout_panel>
                 <layout_panel
                         border="true"
@@ -300,11 +303,13 @@
                             follows="left|top"
                             increment="0.01"
                             initial_value="0.1"
+                            height="16"
                             layout="topleft"
                             left_delta="5"
                             name="water_scale_above"
                             top_pad="5"
-                            width="200" />
+                            width="200"
+                            can_edit_text="true" />
                     <text
                             type="string"
                             length="1"
@@ -312,7 +317,7 @@
                             height="16"
                             layout="topleft"
                             left_delta="-5"
-                            top_pad="15"
+                            top_pad="5"
                             width="215">
                         Refraction Scale (Below)
                     </text>
@@ -320,14 +325,15 @@
                             control_name="water_scale_below"
                             decimal_digits="2"
                             follows="left|top"
-                            height="10"
+                            height="16"
                             increment="0.01"
                             initial_value="0"
                             layout="topleft"
                             left_delta="5"
                             name="water_scale_below"
                             top_pad="5"
-                            width="200"/>
+                            width="200"
+                            can_edit_text="true"/>
                     <text
                             follows="left|top|right"
                             font="SansSerif"
@@ -341,7 +347,7 @@
                     <slider
                             control_name="water_blur_multip"
                             follows="left|top"
-                            height="10"
+                            height="16"
                             increment="0.001"
                             initial_value="0"
                             layout="topleft"
@@ -349,7 +355,8 @@
                             max_val="0.16"
                             name="water_blur_multip"
                             top_pad="5"
-                            width="200"/>
+                            width="200"
+                            can_edit_text="true"/>
                 </layout_panel>
             </layout_stack>
         </layout_panel>
-- 
cgit v1.2.3


From 438d97714778ebb8728f0ac3808f0b8f98afc1fa Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 25 Jun 2018 16:02:51 -0700
Subject: Adding pause clouds to menu, and throttling expensive visual update
 on change.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3cac835961..d4881d3cba 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -639,9 +639,20 @@
 
         <menu
          create_jump_keys="true"
-         label="Sun"
-         name="Sun"
+         label="Environment"
+         name="Environment"
          tear_off="true">
+            <menu_item_check
+             label="Pause Clouds"
+             name="pauseclouds">
+                <menu_item_check.on_click
+                 function="World.EnvSettings"
+                 parameter="pauseclouds" />
+                <menu_item_check.on_check
+                 function="World.EnableEnvSettings" 
+                 parameter="pauseclouds" />
+            </menu_item_check>
+            <menu_item_separator/>
             <menu_item_check
              label="Sunrise"
              name="Sunrise">
-- 
cgit v1.2.3


From 0ff65651cc219eef959c5e961663de2a07595e5a Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 27 Jun 2018 23:52:02 +0100
Subject: MAINT-8011 make newly created Sky, Water, etc create a system folder
 with proper icon

Add entries to strings.xml for all langs for the "settings" string.
---
 indra/newview/skins/default/xui/en/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a40b94a542..74171a86cc 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -395,7 +395,8 @@ http://secondlife.com/support for help fixing this problem.
 	<string name="symbolic link">link</string>
 	<string name="symbolic folder link">folder link</string>
   <string name="mesh">mesh</string>
-
+  <string name="settings">settings</string>
+  
 	<!-- llvoavatar. Displayed in the avatar chat bubble -->
 	<string name="AvatarEditingAppearance">(Editing Appearance)</string>
 	<string name="AvatarAway">Away</string>
-- 
cgit v1.2.3


From d5c465b4ab263e568761f6197534f7ddcda8a5ee Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 29 Jun 2018 20:15:10 +0100
Subject: MAINT-8817 remove automatic update of inv_proj matrix so sunLightF
 which expects it not to match the projection mat works again

Fix misspellinging in missing settings asset notification string

Fix moon quat conversion to get proper directional rotation

Add early out so attempting to set parcel env settings doesn't crash
---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f69c3d261f..fcabf1059e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11101,7 +11101,7 @@ Cannot create large prims that intersect other residents.  Please re-try when ot
    name="FailedToFindSettings"
    persist="true"
    type="alertmodal">
-Failed to find the settisgs named [DESC] in database.
+Failed to find the settings named [DESC] in database.
   <tag>fail</tag>
   </notification>
   
-- 
cgit v1.2.3


From 96e8e670e104d852b1a925976f3d935448eba103 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 29 Jun 2018 12:59:53 -0700
Subject: Enable settings inventory filter checkbox.  Fix day cycle editor
 selection on open.

---
 .../xui/en/floater_inventory_view_finder.xml       | 29 +++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index 1b4992b4ca..7142fea0ea 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_minimize="false"
- height="468"
+ height="488"
  layout="topleft"
  name="Inventory Finder"
  help_topic="inventory_finder"
@@ -212,6 +212,23 @@
      name="check_snapshot"
      top_delta="0"
      width="126" />
+    <icon
+     height="16"
+     image_name="Inv_Settings"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_settings"
+     top="262"
+     width="16" />
+    <check_box
+     height="16"
+     label="Settings"
+     layout="topleft"
+     left_pad="2"
+     name="check_settings"
+     top_delta="0"
+     width="126" />
     <button
      follows="left|top"
      height="20"
@@ -220,7 +237,7 @@
      layout="topleft"
      left="8"
      name="All"
-     top="262"
+     top="282"
      width="100" />
     <button
      height="20"
@@ -274,7 +291,7 @@
      width="260"/>
     <check_box
      height="16"
-     top="352"
+     top="372"
      label="Since Logoff"
      layout="topleft"
      left_delta="0"
@@ -290,7 +307,7 @@
      layout="topleft"
      left_delta="0"
      name="- OR -"
-     top="370"
+     top="390"
      width="144">
         - OR -
     </text>
@@ -298,7 +315,7 @@
      height="16"
      layout="topleft"
      name="date_search_direction"
-     top="388"
+     top="408"
      left="8"
      width="270">
      <radio_item
@@ -368,6 +385,6 @@
      layout="topleft"
      name="Close"
      right="-6"
-     top="434"
+     top="454"
      width="76" />
 </floater>
-- 
cgit v1.2.3


From ef09ef2b09f054ced394776a9b3d19babcfd3986 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 29 Jun 2018 15:56:09 -0700
Subject: Put up notifications to the user when things go terribly terribly
 wrong.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index fcabf1059e..eb4f658495 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11101,7 +11101,7 @@ Cannot create large prims that intersect other residents.  Please re-try when ot
    name="FailedToFindSettings"
    persist="true"
    type="alertmodal">
-Failed to find the settings named [DESC] in database.
+Could not load the settings for [NAME] from the database.
   <tag>fail</tag>
   </notification>
   
@@ -11131,5 +11131,14 @@ Unable to apply those settings to the environment.
 This Region does not support environmental settings.
   <tag>fail</tag>
   </notification>
+
+  <notification
+   icon="notify.tga"
+   name="WLImportFail"
+   persist="true"
+   type="alertmodal">
+Unable to import legacy Windlight settings from [FILE].
+  <tag>fail</tag>
+  </notification>
   
 </notifications>
-- 
cgit v1.2.3


From affd9ac094b8c2fba19b6bcc43ee6460be3dca28 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 29 Jun 2018 16:23:48 -0700
Subject: Add menu item for "My Environments"

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 32 ++++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d4881d3cba..b7a6cb9287 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -642,17 +642,6 @@
          label="Environment"
          name="Environment"
          tear_off="true">
-            <menu_item_check
-             label="Pause Clouds"
-             name="pauseclouds">
-                <menu_item_check.on_click
-                 function="World.EnvSettings"
-                 parameter="pauseclouds" />
-                <menu_item_check.on_check
-                 function="World.EnableEnvSettings" 
-                 parameter="pauseclouds" />
-            </menu_item_check>
-            <menu_item_separator/>
             <menu_item_check
              label="Sunrise"
              name="Sunrise">
@@ -695,7 +684,6 @@
                  function="World.EnableEnvSettings" 
                  parameter="midnight" />
             </menu_item_check>
-            <menu_item_separator/>
             <menu_item_check
              label="Use Region Settings"
              name="Use Region Settings">
@@ -706,6 +694,26 @@
                  function="World.EnableEnvSettings" 
                  parameter="region" />
             </menu_item_check>
+            <menu_item_separator/>
+            <menu_item
+             label="My Environments..."
+             name="My Environments">
+                <menu_item_check.on_click
+                 function="World.MyEnvirons"
+                 parameter="my_environs" />
+            </menu_item>
+            <menu_item_separator/>
+            <menu_item_check
+             label="Pause Clouds"
+             name="pauseclouds">
+                <menu_item_check.on_click
+                 function="World.EnvSettings"
+                 parameter="pauseclouds" />
+                <menu_item_check.on_check
+                 function="World.EnableEnvSettings" 
+                 parameter="pauseclouds" />
+            </menu_item_check>
+            
         </menu>
 	    
 <!--   
-- 
cgit v1.2.3


From a4137d72ebc9f49dfd8bd124b255da0dfbc4ba92 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 3 Jul 2018 14:18:24 -0700
Subject: MAINT-8821: New "My Environments" floater.  First pass.

---
 .../default/xui/en/floater_my_environments.xml     | 184 +++++++++++++++++++++
 .../skins/default/xui/en/menu_settings_gear.xml    |  57 +++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |  16 +-
 .../newview/skins/default/xui/en/notifications.xml |  10 ++
 4 files changed, 259 insertions(+), 8 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_my_environments.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_settings_gear.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
new file mode 100644
index 0000000000..74921e8b64
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+        positioning="cascading"
+        save_rect="true"
+        legacy_header_height="18"
+        can_resize="true"
+        height="465"
+        name="my_environments"
+        help_topic="my_environments"
+        title="MY ENVIRONMENTS"
+        background_visible="true"
+        label="Places"
+        layout="topleft"
+        min_height="350"
+        min_width="265"
+        width="313">
+    <layout_stack 
+            follows="all"
+            layout="topleft"
+            left="5"
+            top="20"
+            right="-5"
+            bottom="-5"
+            orientation="vertical">
+        <layout_panel
+                border="true"
+                bevel_style="in"
+                auto_resize="false"
+                user_resize="true"
+                tab_group="1"
+                height="24"
+                name="filter_panel"
+                label="Filters"
+                font="SansSerifBold">
+            <icon
+                    height="16"
+                    image_name="Inv_SettingsDay"
+                    layout="topleft"
+                    mouse_opaque="true"
+                    name="icon_settingsdays"
+                    left="4"
+                    width="16" />
+            <check_box
+                    height="16"
+                    label="Days"
+                    layout="topleft"
+                    left_pad="2"
+                    name="chk_days"
+                    top_delta="0"
+                    width="60" />
+            <icon
+                    height="16"
+                    image_name="Inv_SettingsSky"
+                    layout="topleft"
+                    mouse_opaque="true"
+                    name="icon_settingsskies"
+                    left_pad="10"
+                    width="16" />
+            <check_box
+                    height="16"
+                    label="Skies"
+                    layout="topleft"
+                    left_pad="2"
+                    name="chk_skies"
+                    top_delta="0"
+                    width="60" />
+            <icon
+                    height="16"
+                    image_name="Inv_SettingsWater"
+                    layout="topleft"
+                    mouse_opaque="true"
+                    name="icon_settingswater"
+                    left_pad="10"
+                    width="16" />
+            <check_box
+                    height="16"
+                    label="Water"
+                    layout="topleft"
+                    left_pad="2"
+                    name="chk_water"
+                    top_delta="0"
+                    width="60" />
+        </layout_panel>
+        <layout_panel
+                auto_resize="true"
+                user_resize="true"
+                tab_group="1"
+                name="list_panel"
+                label="Environments"
+                font="SansSerifBold">
+            <inventory_panel
+                    allow_multi_select="false"
+                    bg_visible="true"
+                    bg_alpha_color="DkGray2"
+                    border="true"
+                    follows="left|top|right|bottom"
+                    left="2"
+                    name="pnl_settings"
+                    top="2"
+                    right="-2"
+                    bottom="-36" /> 
+            <check_box
+                    follows="left|bottom"
+                    height="14"
+                    initial_value="false"
+                    label="Show Empty Folders"
+                    layout="topleft"
+                    name="chk_showfolders"
+                    top="-20"
+                    top_pad="0"
+                    left_delta="-3"
+                    width="200" />
+                
+        </layout_panel>
+        <layout_panel
+                auto_resize="false"
+                user_resize="true"
+                tab_group="1"
+                height="62"
+                name="pnl_control"
+                font="SansSerifBold">
+            <panel
+                    background_visible="true"
+                    bevel_style="none"
+                    top_pad="0"
+                    follows="top|left|right"
+                    height="30"
+                    label="bottom_panel"
+                    layout="topleft"
+                    left="0"
+                    name="pnl_bottom">
+                <menu_button
+                        follows="bottom|left"
+                        height="18"
+                        image_disabled="OptionsMenu_Disabled"
+                        image_selected="OptionsMenu_Press"
+                        image_unselected="OptionsMenu_Off"
+                        layout="topleft"
+                        left="10"
+                        menu_filename="menu_settings_gear.xml"
+                        name="btn_gear"
+                        top="5"
+                        tool_tip="More options"
+                        width="18" />
+                <button
+                        follows="bottom|left"
+                        font="SansSerifBigBold"
+                        height="18"
+                        image_selected="AddItem_Press"
+                        image_unselected="AddItem_Off"
+                        image_disabled="AddItem_Disabled"
+                        layout="topleft"
+                        left_pad="5"
+                        name="btn_newsettings"
+                        tool_tip="Make new gesture"
+                        top_delta="0"
+                        width="18" />
+                <button
+                        follows="bottom|right"
+                        font="SansSerifBigBold"
+                        height="18"
+                        image_selected="TrashItem_Press"
+                        image_unselected="TrashItem_Off"
+                        image_disabled="TrashItem_Disabled"
+                        layout="topleft"
+                        name="btn_del"
+                        right="-5"
+                        tool_tip="Delete this gesture"
+                        top_delta="0"
+                        width="18" />
+            </panel>
+            <button
+                    follows="top|left"
+                    height="23"
+                    label="Edit"
+                    layout="topleft"
+                    left="6"
+                    name="btn_edit"
+                    top_pad="5"
+                    width="83" />
+
+        </layout_panel>
+    </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_settings_gear.xml b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
new file mode 100644
index 0000000000..73fae4f693
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ mouse_opaque="false"
+ name="menu_settings_gear"
+ visible="false">
+    <menu_item_call
+     label="Apply Selected Setting to Myself"
+     layout="topleft"
+     name="activate">
+        <on_click
+         function="Gesture.Action.ToogleActiveState" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="copy_settings">
+        <on_click
+         function="Gesture.Action.CopyPaste"
+         parameter="copy_gesture" />
+        <on_enable
+         function="Gesture.EnableAction"
+         parameter="copy_gesture" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="paste_settings">
+        <on_click
+         function="Gesture.Action.CopyPaste"
+         parameter="paste" />
+        <on_enable
+         function="Gesture.EnableAction"
+         parameter="paste" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy UUID"
+     layout="topleft"
+     name="copy_uuid">
+        <on_click
+         function="Gesture.Action.CopyPaste"
+         parameter="copy_uuid" />
+        <on_enable
+         function="Gesture.EnableAction"
+         parameter="copy_uuid" />
+    </menu_item_call>
+    <menu_item_call
+     label="Edit"
+     layout="topleft"
+     name="edit_settings">
+        <on_click
+         function="Gesture.Action.ShowPreview" />
+        <on_enable
+         function="Gesture.EnableAction"
+         parameter="edit_settings" />
+    </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b7a6cb9287..fe3f52ebcb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -695,23 +695,23 @@
                  parameter="region" />
             </menu_item_check>
             <menu_item_separator/>
-            <menu_item
+            <menu_item_call
              label="My Environments..."
-             name="My Environments">
-                <menu_item_check.on_click
-                 function="World.MyEnvirons"
+             name="my_environs">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
                  parameter="my_environs" />
-            </menu_item>
+            </menu_item_call>
             <menu_item_separator/>
             <menu_item_check
              label="Pause Clouds"
-             name="pauseclouds">
+             name="pause_clouds">
                 <menu_item_check.on_click
                  function="World.EnvSettings"
-                 parameter="pauseclouds" />
+                 parameter="pause_clouds" />
                 <menu_item_check.on_check
                  function="World.EnableEnvSettings" 
-                 parameter="pauseclouds" />
+                 parameter="pause_clouds" />
             </menu_item_check>
             
         </menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index eb4f658495..6473ec9bc3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11140,5 +11140,15 @@ This Region does not support environmental settings.
 Unable to import legacy Windlight settings from [FILE].
   <tag>fail</tag>
   </notification>
+
+  <notification
+   icon="notify.tga"
+   name="WLParcelApplyFail"
+   persist="true"
+   type="alertmodal">
+Unable to set the environment for this parcel.
+Please enter or select a parcel that you have rights to modify.
+  <tag>fail</tag>
+  </notification>
   
 </notifications>
-- 
cgit v1.2.3


From 0bf678e23b2a29fcd2bf1488f999168b8737c010 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 5 Jul 2018 18:30:56 +0300
Subject: MAINT-8827 EEP Edit Day Cycle window needs Save & Cancel buttons
 linked to bottom of the window

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  | 879 +++++++++++----------
 1 file changed, 447 insertions(+), 432 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index b03a7037a6..fb53eb969b 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-        height="602"
         layout="topleft"
         name="env_edit_extdaycycle"
         help_topic="day_presets"
         save_rect="true"
         title="Edit Day Cycle"
         width="705"
+        height="602"
+        min_width="450"
+        min_height="85"
         can_resize="true">
 
     <!-- obsolete?, add as hint for 'save' button? -->
@@ -18,14 +20,14 @@
     <!-- Todo: These 5 strings might be subjected to a change to get dynamic labels, consider using layout_stack to get dynamic width adjustment-->
     <string name="time_label"> ([HH]:[MM])</string>
 
-    <layout_stack name="test_stack"
+    <layout_stack name="outer_stack"
             width="705"
             height="602"
             follows="all"
             animate="false"
             top="0"
             orientation="vertical">
-        <layout_panel name="temp"
+        <layout_panel name="name_and_import"
                 border="false"
                 auto_resize="false"
                 user_resize="true"
@@ -64,460 +66,473 @@
                     tool_tip="Import legacy settings from disk." 
                     width="96" />
         </layout_panel>
-        <layout_panel name="timeline_track_selection"
+        <layout_panel name="content"
                 border="false"
-                bevel_style="in"
-                auto_resize="false"
+                auto_resize="true"
                 user_resize="true"
-                height="150"
-                min_height="0"
-                visible="true">
-            <panel name="timeline_layers"
-                    border="false"
-                    follows="left|top"
-                    height="150"
-                    width="110"
-                    top_pad="0"
-                    min_height="0"
-                    visible="true">
-                <button
-                        follows="left|top"
-                        height="23"
-                        label="Sky 4"
-                        layout="topleft"
-                        top_pad="5"
-                        left="10"
-                        name="sky4_track"
-                        width="100"> 
-                    <button.commit_callback
-                            function="DayCycle.Track"
-                            parameter="4" />
-                </button>
-                <button
-                        follows="left|top"
-                        height="23"
-                        label="Sky 3"
-                        layout="topleft"
-                        top_pad="0"
-                        left="10"
-                        name="sky3_track"
-                        width="100"> 
-                    <button.commit_callback
-                            function="DayCycle.Track"
-                            parameter="3" />
-                </button>
-                <button
-                        follows="left|top"
-                        height="23"
-                        label="Sky 2"
-                        layout="topleft"
-                        top_pad="0"
-                        left="10"
-                        name="sky2_track"
-                        width="100"> 
-                    <button.commit_callback
-                            function="DayCycle.Track"
-                            parameter="2" />
-                </button>
-                <button
-                        follows="left|top"
-                        height="23"
-                        label="Ground Level"
-                        layout="topleft"
-                        top_pad="0"
-                        left="10"
-                        name="sky1_track"
-                        width="100"> 
-                    <button.commit_callback
-                            function="DayCycle.Track"
-                            parameter="1" />
-                </button>
-                <button
-                        follows="left|top"
-                        height="23"
-                        label="Water"
-                        layout="topleft"
-                        top_pad="0"
-                        left="10"
-                        name="water_track"
-                        width="100"> 
-                    <button.commit_callback
-                            function="DayCycle.Track"
-                            parameter="0" />
-                </button>
-            </panel>
-            <panel name="timeline"
-                    border="true"
-                    follows="left|top"
-                    height="150"
-                    min_height="0"
-                    width="595"
-                    min_width="595"
-                    left_pad="0"
-                    visible="true">              
-                <!-- Todo: These 5 tests might be subjected to a change to be dynamically generated, consider using layout_stack to get dynamic width adjustment-->
-                <text
-                        follows="left|top"
-                        height="15"
-                        layout="topleft"
-                        left="10"
-                        name="p0"
-                        top_pad="5"
-                        value="0%[DSC]"
-                        width="80" />
-                <text
-                        follows="left|top|right"
-                        height="15"
-                        layout="topleft"
-                        left_pad="39"
-                        name="p1"
-                        top_delta="0"
-                        value="25%[DSC]"
-                        width="80" />
-                <text
-                        follows="left|top|right"
-                        height="15"
-                        layout="topleft"
-                        left_pad="39"
-                        name="p2"
-                        top_delta="0"
-                        value="50%[DSC]"
-                        width="80" />
-                <text
-                        follows="left|top|right"
-                        height="15"
-                        layout="topleft"
-                        left_pad="39"
-                        name="p3"
-                        top_delta="0"
-                        value="75%[DSC]"
-                        width="80" />
-                <text
-                        follows="left|top|right"
-                        height="15"
-                        layout="topleft"
-                        left_pad="39"
-                        name="p4"
-                        top_delta="0"
-                        value="100%[DSC]"
-                        width="80" />
-                <multi_slider
-                        decimal_digits="0"
-                        draw_track="false"
-                        follows="bottom"
-                        height="10"
-                        increment="0.01"
-                        initial_value="0"
-                        layout="topleft"
-                        left="10"
-                        max_sliders="1"
-                        max_val="1"
-                        name="WLTimeSlider"
-                        show_text="false"
-                        top_pad="0"
-                        use_triangle="true"
-                        width="525" />
-
-                <multi_slider
-                        decimal_digits="0"
-                        follows="bottom"
-                        height="10"
-                        increment="0.01"
-                        initial_value="0"
-                        layout="topleft"
-                        left="10"
-                        max_sliders="20"
-                        max_val="1"
-                        name="WLDayCycleFrames"
-                        show_text="false"
-                        top_pad="15"
-                        width="525" />
-
-                <text
-                        follows="left|bottom"
-                        height="20"
-                        layout="topleft"
-                        left_pad="0"
-                        name="current_time"
-                        value="[PRCNT]%[DSC]"
-                        top_delta="-5"
-                        width="70" />
-
-                <layout_stack
-                        name="progress_control"
-                        follows="top|left"
-                        height="25"
-                        width="83"
-                        layout="topleft"
-                        animate="false"
-                        left="225"
-                        top_pad="40"
-                        orientation="horizontal">
-
-                    <layout_panel
-                            name="skip_back"
-                            mouse_opaque="false"
-                            auto_resize="false"
-                            layout="topleft"
-                            top="0"
-                            height="25"
-                            min_width="25"
-                            width="25">
+                background_visible="false">
+            <layout_stack name="content_stack"
+                    width="705"
+                    follows="all"
+                    animate="false"
+                    top="0"
+                    orientation="vertical">
+                <layout_panel name="timeline_track_selection"
+                        border="false"
+                        bevel_style="in"
+                        auto_resize="false"
+                        user_resize="true"
+                        height="150"
+                        min_height="0"
+                        visible="true">
+                    <panel name="timeline_layers"
+                            border="false"
+                            follows="left|top"
+                            height="150"
+                            width="110"
+                            top_pad="0"
+                            min_height="0"
+                            visible="true">
                         <button
-                                name="skip_back_btn"
-                                follows="top"
-                                image_overlay="SkipBackward_Off"
-                                image_disabled="PushButton_Disabled"
-                                image_disabled_selected="PushButton_Disabled"
-                                image_selected="PushButton_Selected"
-                                image_unselected="PushButton_Off"
-                                hover_glow_amount="0.15"
-                                auto_resize="false"
-                                width="25"
-                                height="25"
+                                follows="left|top"
+                                height="23"
+                                label="Sky 4"
                                 layout="topleft"
-                                tool_tip="Step back"
-                                top="0"
-                                left="0">
+                                top_pad="5"
+                                left="10"
+                                name="sky4_track"
+                                width="100"> 
                             <button.commit_callback
-                                    function="DayCycle.PlayActions"
-                                    parameter="back" />
+                                    function="DayCycle.Track"
+                                    parameter="4" />
                         </button>
-                    </layout_panel>
-
-                    <layout_panel
-                            name="play_layout"
-                            mouse_opaque="false"
-                            auto_resize="false"
-                            layout="topleft"
-                            top="0"
-                            height="25"
-                            min_width="25"
-                            width="25">
                         <button
-                                name="play_btn"
-                                follows="top"
-                                image_overlay="Play_Off"
-                                image_disabled="PushButton_Disabled"
-                                image_disabled_selected="PushButton_Disabled"
-                                image_selected="PushButton_Selected"
-                                image_unselected="PushButton_Off"
-                                hover_glow_amount="0.15"
-                                auto_resize="false"
+                                follows="left|top"
+                                height="23"
+                                label="Sky 3"
                                 layout="topleft"
-                                height="25"
-                                width="25"
-                                left="0"
-                                top="0">
+                                top_pad="0"
+                                left="10"
+                                name="sky3_track"
+                                width="100"> 
                             <button.commit_callback
-                                    function="DayCycle.PlayActions"
-                                    parameter="play" />
+                                    function="DayCycle.Track"
+                                    parameter="3" />
                         </button>
-                    </layout_panel>
-
-                    <layout_panel
-                            name="pause_layout"
-                            mouse_opaque="false"
-                            auto_resize="false"
-                            layout="topleft"
-                            top="0"
-                            height="25"
-                            min_width="25"
-                            width="25"
-                            visible="false">
                         <button
-                                name="pause_btn"
-                                follows="top"
-                                image_overlay="Pause_Off"
-                                image_disabled="PushButton_Disabled"
-                                image_disabled_selected="PushButton_Disabled"
-                                image_selected="PushButton_Selected"
-                                image_unselected="PushButton_Off"
-                                hover_glow_amount="0.15"
-                                auto_resize="false"
+                                follows="left|top"
+                                height="23"
+                                label="Sky 2"
                                 layout="topleft"
-                                height="25"
-                                width="25"
-                                left="0"
-                                top="0">
+                                top_pad="0"
+                                left="10"
+                                name="sky2_track"
+                                width="100"> 
                             <button.commit_callback
-                                    function="DayCycle.PlayActions"
-                                    parameter="pause" />
+                                    function="DayCycle.Track"
+                                    parameter="2" />
                         </button>
-                    </layout_panel>
-
-                    <layout_panel
-                            name="skip_forward"
-                            mouse_opaque="false"
-                            auto_resize="false"
-                            layout="topleft"
-                            top="0"
-                            height="25"
-                            min_width="25"
-                            width="25">
                         <button
-                                name="skip_forward_btn"
-                                follows="top"
-                                image_overlay="SkipForward_Off"
-                                image_disabled="PushButton_Disabled"
-                                image_disabled_selected="PushButton_Disabled"
-                                image_selected="PushButton_Selected"
-                                image_unselected="PushButton_Off"
-                                hover_glow_amount="0.15"
-                                width="25"
-                                height="25"
+                                follows="left|top"
+                                height="23"
+                                label="Ground Level"
                                 layout="topleft"
-                                tool_tip="Step forward"
-                                top="0">
+                                top_pad="0"
+                                left="10"
+                                name="sky1_track"
+                                width="100"> 
                             <button.commit_callback
-                                    function="DayCycle.PlayActions"
-                                    parameter="forward" />
+                                    function="DayCycle.Track"
+                                    parameter="1" />
                         </button>
-                    </layout_panel>
-                </layout_stack>
+                        <button
+                                follows="left|top"
+                                height="23"
+                                label="Water"
+                                layout="topleft"
+                                top_pad="0"
+                                left="10"
+                                name="water_track"
+                                width="100"> 
+                            <button.commit_callback
+                                    function="DayCycle.Track"
+                                    parameter="0" />
+                        </button>
+                    </panel>
+                    <panel name="timeline"
+                            border="true"
+                            follows="left|top"
+                            height="150"
+                            min_height="0"
+                            width="595"
+                            min_width="595"
+                            left_pad="0"
+                            visible="true">              
+                        <!-- Todo: These 5 tests might be subjected to a change to be dynamically generated, consider using layout_stack to get dynamic width adjustment-->
+                        <text
+                                follows="left|top"
+                                height="15"
+                                layout="topleft"
+                                left="10"
+                                name="p0"
+                                top_pad="5"
+                                value="0%[DSC]"
+                                width="80" />
+                        <text
+                                follows="left|top|right"
+                                height="15"
+                                layout="topleft"
+                                left_pad="39"
+                                name="p1"
+                                top_delta="0"
+                                value="25%[DSC]"
+                                width="80" />
+                        <text
+                                follows="left|top|right"
+                                height="15"
+                                layout="topleft"
+                                left_pad="39"
+                                name="p2"
+                                top_delta="0"
+                                value="50%[DSC]"
+                                width="80" />
+                        <text
+                                follows="left|top|right"
+                                height="15"
+                                layout="topleft"
+                                left_pad="39"
+                                name="p3"
+                                top_delta="0"
+                                value="75%[DSC]"
+                                width="80" />
+                        <text
+                                follows="left|top|right"
+                                height="15"
+                                layout="topleft"
+                                left_pad="39"
+                                name="p4"
+                                top_delta="0"
+                                value="100%[DSC]"
+                                width="80" />
+                        <multi_slider
+                                decimal_digits="0"
+                                draw_track="false"
+                                follows="bottom"
+                                height="10"
+                                increment="0.01"
+                                initial_value="0"
+                                layout="topleft"
+                                left="10"
+                                max_sliders="1"
+                                max_val="1"
+                                name="WLTimeSlider"
+                                show_text="false"
+                                top_pad="0"
+                                use_triangle="true"
+                                width="525" />
 
-                <button
-                        follows="top|left"
-                        height="23"
-                        width="90"
-                        label="Add Frame"
-                        left_pad="175"
-                        top_delta="-12"
-                        name="add_frame" />
-                <button
-                        follows="left|top"
-                        height="23"
-                        width="90"
-                        label="Delete Frame"
-                        top_pad="0"
-                        left_delta="0"
-                        name="delete_frame" />
-            </panel>
-        </layout_panel>
-        <layout_panel name="frame_edit_controls"
-                auto_resize="false"
-                user_resize="true"
-                height="30"
-                width="700"
-                min_height="30"
-                visible="true">
-            <!--bg_alpha_color="blue"
+                        <multi_slider
+                                decimal_digits="0"
+                                follows="bottom"
+                                height="10"
+                                increment="0.01"
+                                initial_value="0"
+                                layout="topleft"
+                                left="10"
+                                max_sliders="20"
+                                max_val="1"
+                                name="WLDayCycleFrames"
+                                show_text="false"
+                                top_pad="15"
+                                width="525" />
+
+                        <text
+                                follows="left|bottom"
+                                height="20"
+                                layout="topleft"
+                                left_pad="0"
+                                name="current_time"
+                                value="[PRCNT]%[DSC]"
+                                top_delta="-5"
+                                width="70" />
+
+                        <layout_stack
+                                name="progress_control"
+                                follows="top|left"
+                                height="25"
+                                width="83"
+                                layout="topleft"
+                                animate="false"
+                                left="225"
+                                top_pad="40"
+                                orientation="horizontal">
+
+                            <layout_panel
+                                    name="skip_back"
+                                    mouse_opaque="false"
+                                    auto_resize="false"
+                                    layout="topleft"
+                                    top="0"
+                                    height="25"
+                                    min_width="25"
+                                    width="25">
+                                <button
+                                        name="skip_back_btn"
+                                        follows="top"
+                                        image_overlay="SkipBackward_Off"
+                                        image_disabled="PushButton_Disabled"
+                                        image_disabled_selected="PushButton_Disabled"
+                                        image_selected="PushButton_Selected"
+                                        image_unselected="PushButton_Off"
+                                        hover_glow_amount="0.15"
+                                        auto_resize="false"
+                                        width="25"
+                                        height="25"
+                                        layout="topleft"
+                                        tool_tip="Step back"
+                                        top="0"
+                                        left="0">
+                                    <button.commit_callback
+                                            function="DayCycle.PlayActions"
+                                            parameter="back" />
+                                </button>
+                            </layout_panel>
+
+                            <layout_panel
+                                    name="play_layout"
+                                    mouse_opaque="false"
+                                    auto_resize="false"
+                                    layout="topleft"
+                                    top="0"
+                                    height="25"
+                                    min_width="25"
+                                    width="25">
+                                <button
+                                        name="play_btn"
+                                        follows="top"
+                                        image_overlay="Play_Off"
+                                        image_disabled="PushButton_Disabled"
+                                        image_disabled_selected="PushButton_Disabled"
+                                        image_selected="PushButton_Selected"
+                                        image_unselected="PushButton_Off"
+                                        hover_glow_amount="0.15"
+                                        auto_resize="false"
+                                        layout="topleft"
+                                        height="25"
+                                        width="25"
+                                        left="0"
+                                        top="0">
+                                    <button.commit_callback
+                                            function="DayCycle.PlayActions"
+                                            parameter="play" />
+                                </button>
+                            </layout_panel>
+
+                            <layout_panel
+                                    name="pause_layout"
+                                    mouse_opaque="false"
+                                    auto_resize="false"
+                                    layout="topleft"
+                                    top="0"
+                                    height="25"
+                                    min_width="25"
+                                    width="25"
+                                    visible="false">
+                                <button
+                                        name="pause_btn"
+                                        follows="top"
+                                        image_overlay="Pause_Off"
+                                        image_disabled="PushButton_Disabled"
+                                        image_disabled_selected="PushButton_Disabled"
+                                        image_selected="PushButton_Selected"
+                                        image_unselected="PushButton_Off"
+                                        hover_glow_amount="0.15"
+                                        auto_resize="false"
+                                        layout="topleft"
+                                        height="25"
+                                        width="25"
+                                        left="0"
+                                        top="0">
+                                    <button.commit_callback
+                                            function="DayCycle.PlayActions"
+                                            parameter="pause" />
+                                </button>
+                            </layout_panel>
+
+                            <layout_panel
+                                    name="skip_forward"
+                                    mouse_opaque="false"
+                                    auto_resize="false"
+                                    layout="topleft"
+                                    top="0"
+                                    height="25"
+                                    min_width="25"
+                                    width="25">
+                                <button
+                                        name="skip_forward_btn"
+                                        follows="top"
+                                        image_overlay="SkipForward_Off"
+                                        image_disabled="PushButton_Disabled"
+                                        image_disabled_selected="PushButton_Disabled"
+                                        image_selected="PushButton_Selected"
+                                        image_unselected="PushButton_Off"
+                                        hover_glow_amount="0.15"
+                                        width="25"
+                                        height="25"
+                                        layout="topleft"
+                                        tool_tip="Step forward"
+                                        top="0">
+                                    <button.commit_callback
+                                            function="DayCycle.PlayActions"
+                                            parameter="forward" />
+                                </button>
+                            </layout_panel>
+                        </layout_stack>
+
+                        <button
+                                follows="top|left"
+                                height="23"
+                                width="90"
+                                label="Add Frame"
+                                left_pad="175"
+                                top_delta="-12"
+                                name="add_frame" />
+                        <button
+                                follows="left|top"
+                                height="23"
+                                width="90"
+                                label="Delete Frame"
+                                top_pad="0"
+                                left_delta="0"
+                                name="delete_frame" />
+                    </panel>
+                </layout_panel>
+                <layout_panel name="frame_edit_controls"
+                        auto_resize="false"
+                        user_resize="true"
+                        height="30"
+                        width="700"
+                        min_height="30"
+                        visible="true">
+                    <!--bg_alpha_color="blue"
                 background_visible="true" -->
-            <icon 
-                    border="1"
-                    bevel_style="out"
-                    name="icn_lock_edit"
-                    layout="bottomleft"
-                    follows="bottom"
-                    image_name="Locked_Icon"
-                    bottom="4"
-                    left="5"
-                    height="15"
-                    width="15"
-                    tab_stop="false" 
-                    visible="false"
-                    tool_tip="Select a key frame above to edit settings"/>
-            <button
-                    name="btn_load_frame"
-                    follows="top"
-                    image_overlay="Command_Inventory_Icon"
-                    image_disabled="PushButton_Disabled"
-                    image_disabled_selected="PushButton_Disabled"
-                    image_selected="PushButton_Selected"
-                    image_unselected="PushButton_Off"
-                    hover_glow_amount="0.15"
-                    auto_resize="false"
-                    layout="topleft"
-                    height="30"
-                    width="30"
-                    left="25"
-                    top="1"
-                    tool_tip="Replace frame with settings from inventory"/>
-        </layout_panel>
-        <layout_panel name="frame_settings_water"
-                auto_resize="true"
-                user_resize="true"
-                height="450"
-                width="700"
-                min_height="0"
-                visible="true">
-            <tab_container
-                    follows="all"
-                    halign="left"
-                    height="420"
-                    layout="topleft"
-                    left="0"
-                    name="water_tabs"
-                    tab_position="top"
-                    tab_width="140"
-                    tab_padding_right="3"
-                    top_pad="0"
-                    width="700">
-                <panel
-                        border="true"
-                        class="panel_settings_water"
-                        filename="panel_settings_water.xml"
-                        label="Water"
-                        layout="topleft"
-                        left_delta="0"
-                        top_pad="5"
-                        name="water_panel"/>
-            </tab_container>
-        </layout_panel>
-        <layout_panel name="frame_settings_sky"
-                auto_resize="false"
-                user_resize="true"
-                height="450"
-                width="700"
-                min_height="0"
-                visible="false">
-            <tab_container
-                    follows="all"
-                    halign="left"
-                    height="386"
-                    visible="true"
-                    layout="topleft"
-                    left="0"
-                    name="sky_tabs"
-                    tab_position="top"
-                    tab_width="140"
-                    tab_padding_right="3"
-                    top_pad="0"
-                    width="700">
-                <panel
-                        border="true"
-                        class="panel_settings_atmos"
-                        filename="panel_settings_sky_atmos.xml"
-                        label="Atmosphere &amp; Lighting"
-                        layout="topleft"
-                        left_delta="0"
-                        top_pad="5"
-                        name="atmosphere_panel" />
-                <panel
-                        border="true"
-                        class="panel_settings_cloud"
-                        filename="panel_settings_sky_clouds.xml"
-                        label="Clouds"
-                        layout="topleft"
-                        left_delta="0"
-                        top_pad="5"
-                        name="clouds_panel" />
-                <panel
-                        border="true"
-                        class="panel_settings_sunmoon"
-                        filename="panel_settings_sky_sunmoon.xml"
-                        label="Sun &amp; Moon"
-                        layout="topleft"
-                        left_delta="0"
-                        top_pad="5"
-                        name="moon_panel" />
-            </tab_container>
+                    <icon 
+                            border="1"
+                            bevel_style="out"
+                            name="icn_lock_edit"
+                            layout="bottomleft"
+                            follows="bottom"
+                            image_name="Locked_Icon"
+                            bottom="4"
+                            left="5"
+                            height="15"
+                            width="15"
+                            tab_stop="false" 
+                            visible="false"
+                            tool_tip="Select a key frame above to edit settings"/>
+                    <button
+                            name="btn_load_frame"
+                            follows="top"
+                            image_overlay="Command_Inventory_Icon"
+                            image_disabled="PushButton_Disabled"
+                            image_disabled_selected="PushButton_Disabled"
+                            image_selected="PushButton_Selected"
+                            image_unselected="PushButton_Off"
+                            hover_glow_amount="0.15"
+                            auto_resize="false"
+                            layout="topleft"
+                            height="30"
+                            width="30"
+                            left="25"
+                            top="1"
+                            tool_tip="Replace frame with settings from inventory"/>
+                </layout_panel>
+                <layout_panel name="frame_settings_water"
+                        auto_resize="true"
+                        user_resize="true"
+                        height="420"
+                        width="700"
+                        min_height="0"
+                        visible="true">
+                    <tab_container
+                            follows="all"
+                            halign="left"
+                            height="420"
+                            layout="topleft"
+                            left="0"
+                            name="water_tabs"
+                            tab_position="top"
+                            tab_width="140"
+                            tab_padding_right="3"
+                            top_pad="0"
+                            width="700">
+                        <panel
+                                border="true"
+                                class="panel_settings_water"
+                                filename="panel_settings_water.xml"
+                                label="Water"
+                                layout="topleft"
+                                left_delta="0"
+                                top_pad="5"
+                                name="water_panel"/>
+                    </tab_container>
+                </layout_panel>
+                <layout_panel name="frame_settings_sky"
+                        auto_resize="true"
+                        user_resize="true"
+                        height="420"
+                        width="700"
+                        min_height="0"
+                        visible="false">
+                    <tab_container
+                            follows="all"
+                            halign="left"
+                            height="420"
+                            visible="true"
+                            layout="topleft"
+                            left="0"
+                            name="sky_tabs"
+                            tab_position="top"
+                            tab_width="140"
+                            tab_padding_right="3"
+                            top_pad="0"
+                            width="700">
+                        <panel
+                                border="true"
+                                class="panel_settings_atmos"
+                                filename="panel_settings_sky_atmos.xml"
+                                label="Atmosphere &amp; Lighting"
+                                layout="topleft"
+                                left_delta="0"
+                                top_pad="5"
+                                name="atmosphere_panel" />
+                        <panel
+                                border="true"
+                                class="panel_settings_cloud"
+                                filename="panel_settings_sky_clouds.xml"
+                                label="Clouds"
+                                layout="topleft"
+                                left_delta="0"
+                                top_pad="5"
+                                name="clouds_panel" />
+                        <panel
+                                border="true"
+                                class="panel_settings_sunmoon"
+                                filename="panel_settings_sky_sunmoon.xml"
+                                label="Sun &amp; Moon"
+                                layout="topleft"
+                                left_delta="0"
+                                top_pad="5"
+                                name="moon_panel" />
+                    </tab_container>
+                </layout_panel>        
+            </layout_stack>
         </layout_panel>
         <layout_panel name="buttons"
                 auto_resize="false"
                 user_resize="true"
                 height="26"
-                min_height="0"
+                min_height="26"
                 visible="true"
                 width="700">
             <button
-- 
cgit v1.2.3


From 21d165011b81909c8cab944755b53f908e51ad16 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 9 Jul 2018 13:26:48 -0700
Subject: Attempting to create a settings inventory item on a non-eep region
 will now show a visible failure message to the user. Menu items for greating
 settings in inventory are disabled on non eep regions.

---
 .../skins/default/xui/en/menu_inventory.xml        |   6 +
 .../skins/default/xui/en/menu_inventory_add.xml    | 554 +++++++++++----------
 .../newview/skins/default/xui/en/notifications.xml |  10 +
 3 files changed, 297 insertions(+), 273 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 6dea791dd9..6f04785e8c 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -324,6 +324,8 @@
             <menu_item_call.on_click
              function="Inventory.DoCreate"
              parameter="sky"/>
+            <menu_item_call.on_enable
+                    function="Inventory.EnvironmentEnabled" />
         </menu_item_call>
         <menu_item_call
          label="New Water"
@@ -332,6 +334,8 @@
             <menu_item_call.on_click
              function="Inventory.DoCreate"
              parameter="water"/>
+            <menu_item_call.on_enable
+                    function="Inventory.EnvironmentEnabled" />
         </menu_item_call>
         <menu_item_call
          label="New Day Cycle"
@@ -340,6 +344,8 @@
             <menu_item_call.on_click
              function="Inventory.DoCreate"
              parameter="daycycle"/>
+            <menu_item_call.on_enable
+                    function="Inventory.EnvironmentEnabled" />
         </menu_item_call>
     </menu>
     <menu
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 7c31bfe54d..0caae9f2ef 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -1,277 +1,285 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu
- layout="topleft"
- left="0"
- mouse_opaque="false"
- can_tear_off="false"
- name="menu_inventory_add"
- visible="false">
-            <menu
-             create_jump_keys="true"
-             label="Upload"
-             layout="topleft"
-             name="upload"
-             tear_off="true">
-                <menu_item_call
-                 label="Image (L$[COST])..."
-                 layout="topleft"
-                 name="Upload Image"
-                 shortcut="control|U">
-                    <menu_item_call.on_click
-                     function="File.UploadImage"
-                     parameter="" />
-                    <menu_item_call.on_enable
-                     function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Sound (L$[COST])..."
-                 layout="topleft"
-                 name="Upload Sound">
-                    <menu_item_call.on_click
-                     function="File.UploadSound"
-                     parameter="" />
-                    <menu_item_call.on_enable
-                     function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Animation (L$[COST])..."
-                 layout="topleft"
-                 name="Upload Animation">
-                    <menu_item_call.on_click
-                     function="File.UploadAnim"
-                     parameter="" />
-                    <menu_item_call.on_enable
-                     function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Model..."
-                 layout="topleft"
-                 name="Upload Model">
-                <menu_item_call.on_click
-                 function="File.UploadModel"
-                 parameter="" />
-                <menu_item_call.on_enable
-                 function="File.EnableUploadModel" />
-                <menu_item_call.on_visible
-                function="File.VisibleUploadModel"/>
-                </menu_item_call>
-                <menu_item_call
-                 label="Bulk (L$[COST] per file)..."
-                 layout="topleft"
-                 name="Bulk Upload">
-                    <menu_item_call.on_click
-                     function="File.UploadBulk"
-                     parameter="" />
-                </menu_item_call>
-            </menu>
+        layout="topleft"
+        left="0"
+        mouse_opaque="false"
+        can_tear_off="false"
+        name="menu_inventory_add"
+        visible="false">
+    <menu
+            create_jump_keys="true"
+            label="Upload"
+            layout="topleft"
+            name="upload"
+            tear_off="true">
+        <menu_item_call
+                label="Image (L$[COST])..."
+                layout="topleft"
+                name="Upload Image"
+                shortcut="control|U">
+            <menu_item_call.on_click
+                    function="File.UploadImage"
+                    parameter="" />
+            <menu_item_call.on_enable
+                    function="File.EnableUpload" />
+        </menu_item_call>
+        <menu_item_call
+                label="Sound (L$[COST])..."
+                layout="topleft"
+                name="Upload Sound">
+            <menu_item_call.on_click
+                    function="File.UploadSound"
+                    parameter="" />
+            <menu_item_call.on_enable
+                    function="File.EnableUpload" />
+        </menu_item_call>
+        <menu_item_call
+                label="Animation (L$[COST])..."
+                layout="topleft"
+                name="Upload Animation">
+            <menu_item_call.on_click
+                    function="File.UploadAnim"
+                    parameter="" />
+            <menu_item_call.on_enable
+                    function="File.EnableUpload" />
+        </menu_item_call>
+        <menu_item_call
+                label="Model..."
+                layout="topleft"
+                name="Upload Model">
+            <menu_item_call.on_click
+                    function="File.UploadModel"
+                    parameter="" />
+            <menu_item_call.on_enable
+                    function="File.EnableUploadModel" />
+            <menu_item_call.on_visible
+                    function="File.VisibleUploadModel"/>
+        </menu_item_call>
+        <menu_item_call
+                label="Bulk (L$[COST] per file)..."
+                layout="topleft"
+                name="Bulk Upload">
+            <menu_item_call.on_click
+                    function="File.UploadBulk"
+                    parameter="" />
+        </menu_item_call>
+    </menu>
 
-            <menu_item_call
-             label="New Folder"
-             layout="topleft"
-             name="New Folder">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="category" />
-            </menu_item_call>
-            <menu_item_call
-             label="New Script"
-             layout="topleft"
-             name="New Script">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="lsl" />
-            </menu_item_call>
-            <menu_item_call
-             label="New Notecard"
-             layout="topleft"
-             name="New Note">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="notecard" />
-            </menu_item_call>
-            <menu_item_call
-             label="New Gesture"
-             layout="topleft"
-             name="New Gesture">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="gesture" />
-            </menu_item_call>
-            <menu
-             height="175"
-             label="New Clothes"
-             layout="topleft"
-             left_delta="0"
-             mouse_opaque="false"
-             name="New Clothes"
-             top_pad="514"
-             width="125">
-                <menu_item_call
-                 label="New Shirt"
-                 layout="topleft"
-                 name="New Shirt">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="shirt" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Pants"
-                 layout="topleft"
-                 name="New Pants">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="pants" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Shoes"
-                 layout="topleft"
-                 name="New Shoes">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="shoes" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Socks"
-                 layout="topleft"
-                 name="New Socks">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="socks" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Jacket"
-                 layout="topleft"
-                 name="New Jacket">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="jacket" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Skirt"
-                 layout="topleft"
-                 name="New Skirt">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="skirt" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Gloves"
-                 layout="topleft"
-                 name="New Gloves">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="gloves" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Undershirt"
-                 layout="topleft"
-                 name="New Undershirt">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="undershirt" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Underpants"
-                 layout="topleft"
-                 name="New Underpants">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="underpants" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Alpha"
-                 layout="topleft"
-                 name="New Alpha">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="alpha" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Tattoo"
-                 layout="topleft"
-                 name="New Tattoo">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="tattoo" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Physics"
-                 layout="topleft"
-                 name="New Physics">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="physics" />
-                </menu_item_call>
-            </menu>
-            <menu
-             height="85"
-             label="New Body Parts"
-             layout="topleft"
-             left_delta="0"
-             mouse_opaque="false"
-             name="New Body Parts"
-             top_pad="514"
-             width="118">
-                <menu_item_call
-                 label="New Shape"
-                 layout="topleft"
-                 name="New Shape">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="shape" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Skin"
-                 layout="topleft"
-                 name="New Skin">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="skin" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Hair"
-                 layout="topleft"
-                 name="New Hair">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="hair" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Eyes"
-                 layout="topleft"
-                 name="New Eyes">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="eyes" />
-                </menu_item_call>
-            </menu>
-            <menu
-             label="New Settings"
-             layout="topleft"
-             name="New Settings">
-                <menu_item_call
-                 label="New Sky"
-                 layout="topleft"
-                 name="New Sky">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="sky"/>
-                </menu_item_call>
-                <menu_item_call
-                 label="New Water"
-                 layout="topleft"
-                 name="New Water">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="water"/>
-                </menu_item_call>
-                <menu_item_call
-                 label="New Day Cycle"
-                 layout="topleft"
-                 name="New Day Cycle">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="daycycle"/>
-                </menu_item_call>
-            </menu>
+    <menu_item_call
+            label="New Folder"
+            layout="topleft"
+            name="New Folder">
+        <menu_item_call.on_click
+                function="Inventory.DoCreate"
+                parameter="category" />
+    </menu_item_call>
+    <menu_item_call
+            label="New Script"
+            layout="topleft"
+            name="New Script">
+        <menu_item_call.on_click
+                function="Inventory.DoCreate"
+                parameter="lsl" />
+    </menu_item_call>
+    <menu_item_call
+            label="New Notecard"
+            layout="topleft"
+            name="New Note">
+        <menu_item_call.on_click
+                function="Inventory.DoCreate"
+                parameter="notecard" />
+    </menu_item_call>
+    <menu_item_call
+            label="New Gesture"
+            layout="topleft"
+            name="New Gesture">
+        <menu_item_call.on_click
+                function="Inventory.DoCreate"
+                parameter="gesture" />
+    </menu_item_call>
+    <menu
+            height="175"
+            label="New Clothes"
+            layout="topleft"
+            left_delta="0"
+            mouse_opaque="false"
+            name="New Clothes"
+            top_pad="514"
+            width="125">
+        <menu_item_call
+                label="New Shirt"
+                layout="topleft"
+                name="New Shirt">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="shirt" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Pants"
+                layout="topleft"
+                name="New Pants">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="pants" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Shoes"
+                layout="topleft"
+                name="New Shoes">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="shoes" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Socks"
+                layout="topleft"
+                name="New Socks">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="socks" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Jacket"
+                layout="topleft"
+                name="New Jacket">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="jacket" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Skirt"
+                layout="topleft"
+                name="New Skirt">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="skirt" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Gloves"
+                layout="topleft"
+                name="New Gloves">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="gloves" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Undershirt"
+                layout="topleft"
+                name="New Undershirt">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="undershirt" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Underpants"
+                layout="topleft"
+                name="New Underpants">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="underpants" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Alpha"
+                layout="topleft"
+                name="New Alpha">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="alpha" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Tattoo"
+                layout="topleft"
+                name="New Tattoo">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="tattoo" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Physics"
+                layout="topleft"
+                name="New Physics">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="physics" />
+        </menu_item_call>
+    </menu>
+    <menu
+            height="85"
+            label="New Body Parts"
+            layout="topleft"
+            left_delta="0"
+            mouse_opaque="false"
+            name="New Body Parts"
+            top_pad="514"
+            width="118">
+        <menu_item_call
+                label="New Shape"
+                layout="topleft"
+                name="New Shape">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="shape" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Skin"
+                layout="topleft"
+                name="New Skin">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="skin" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Hair"
+                layout="topleft"
+                name="New Hair">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="hair" />
+        </menu_item_call>
+        <menu_item_call
+                label="New Eyes"
+                layout="topleft"
+                name="New Eyes">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="eyes" />
+        </menu_item_call>
+    </menu>
+    <menu
+            label="New Settings"
+            layout="topleft"
+            name="New Settings">
+        <menu_item_call
+                label="New Sky"
+                layout="topleft"
+                name="New Sky">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="sky"/>
+            <menu_item_call.on_enable
+                    function="Inventory.EnvironmentEnabled" />
+
+        </menu_item_call>
+        <menu_item_call
+                label="New Water"
+                layout="topleft"
+                name="New Water">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="water"/>
+            <menu_item_call.on_enable
+                    function="Inventory.EnvironmentEnabled" />
+
+        </menu_item_call>
+        <menu_item_call
+                label="New Day Cycle"
+                layout="topleft"
+                name="New Day Cycle">
+            <menu_item_call.on_click
+                    function="Inventory.DoCreate"
+                    parameter="daycycle"/>
+            <menu_item_call.on_enable
+                    function="Inventory.EnvironmentEnabled" />
+        </menu_item_call>
+    </menu>
 </menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6473ec9bc3..26e947b3ca 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11150,5 +11150,15 @@ Unable to set the environment for this parcel.
 Please enter or select a parcel that you have rights to modify.
   <tag>fail</tag>
   </notification>
+
+  <notification
+   icon="notify.tga"
+   name="SettingsUnsuported"
+   persist="true"
+   type="alertmodal">
+Settings are not supported on this region. 
+Please move to a settings enabled region and retry your action.
+  <tag>fail</tag>
+  </notification>
   
 </notifications>
-- 
cgit v1.2.3


From 26b6cc516076c55befff3fbd9c21f47565bbc390 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 9 Jul 2018 17:06:24 -0700
Subject: MAINT-8821: Clean up some of the selection and enable/disable code,
 Add menu for adding settings.

---
 .../default/xui/en/floater_my_environments.xml     |  20 +---
 .../skins/default/xui/en/menu_settings_add.xml     |  37 ++++++++
 .../skins/default/xui/en/menu_settings_gear.xml    | 103 +++++++++++++--------
 3 files changed, 108 insertions(+), 52 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_settings_add.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index 74921e8b64..83416f60d7 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -110,13 +110,12 @@
                     top_pad="0"
                     left_delta="-3"
                     width="200" />
-                
         </layout_panel>
         <layout_panel
                 auto_resize="false"
                 user_resize="true"
                 tab_group="1"
-                height="62"
+                height="31"
                 name="pnl_control"
                 font="SansSerifBold">
             <panel
@@ -142,7 +141,7 @@
                         top="5"
                         tool_tip="More options"
                         width="18" />
-                <button
+                <menu_button
                         follows="bottom|left"
                         font="SansSerifBigBold"
                         height="18"
@@ -151,8 +150,9 @@
                         image_disabled="AddItem_Disabled"
                         layout="topleft"
                         left_pad="5"
+                        menu_filename="menu_settings_add.xml"
                         name="btn_newsettings"
-                        tool_tip="Make new gesture"
+                        tool_tip="Make new setting"
                         top_delta="0"
                         width="18" />
                 <button
@@ -165,20 +165,10 @@
                         layout="topleft"
                         name="btn_del"
                         right="-5"
-                        tool_tip="Delete this gesture"
+                        tool_tip="Delete this setting"
                         top_delta="0"
                         width="18" />
             </panel>
-            <button
-                    follows="top|left"
-                    height="23"
-                    label="Edit"
-                    layout="topleft"
-                    left="6"
-                    name="btn_edit"
-                    top_pad="5"
-                    width="83" />
-
         </layout_panel>
     </layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_settings_add.xml b/indra/newview/skins/default/xui/en/menu_settings_add.xml
new file mode 100644
index 0000000000..a4782cfdc3
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_settings_add.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+        layout="topleft"
+        mouse_opaque="false"
+        name="menu_settings_add"
+        visible="false">
+    <menu_item_call
+            label="New Sky"
+            layout="topleft"
+            name="New Sky">
+        <menu_item_call.on_click
+                function="MyEnvironments.DoCreate"
+                parameter="sky"/>
+        <menu_item_call.on_enable
+                function="MyEnvironments.EnvironmentEnabled" />
+    </menu_item_call>
+    <menu_item_call
+            label="New Water"
+            layout="topleft"
+            name="New Water">
+        <menu_item_call.on_click
+                function="MyEnvironments.DoCreate"
+                parameter="water"/>
+        <menu_item_call.on_enable
+                function="MyEnvironments.EnvironmentEnabled" />
+    </menu_item_call>
+    <menu_item_call
+            label="New Day Cycle"
+            layout="topleft"
+            name="New Day Cycle">
+        <menu_item_call.on_click
+                function="MyEnvironments.DoCreate"
+                parameter="daycycle"/>
+        <menu_item_call.on_enable
+                function="MyEnvironments.EnvironmentEnabled" />
+    </menu_item_call>
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/menu_settings_gear.xml b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
index 73fae4f693..41fd0fce2c 100644
--- a/indra/newview/skins/default/xui/en/menu_settings_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
@@ -1,57 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <toggleable_menu
- layout="topleft"
- mouse_opaque="false"
- name="menu_settings_gear"
- visible="false">
+        layout="topleft"
+        mouse_opaque="false"
+        name="menu_settings_gear"
+        visible="false">
     <menu_item_call
-     label="Apply Selected Setting to Myself"
-     layout="topleft"
-     name="activate">
+            label="Edit"
+            layout="topleft"
+            name="edit_settings">
         <on_click
-         function="Gesture.Action.ToogleActiveState" />
+                function="MyEnvironments.ShowPreview" />
+        <on_enable
+                function="MyEnvironments.EnableAction"
+                parameter="edit_settings" />
     </menu_item_call>
+    <menu_item_separator
+            layout="topleft" 
+            name="Separator" />
     <menu_item_call
-     label="Copy"
-     layout="topleft"
-     name="copy_settings">
-        <on_click
-         function="Gesture.Action.CopyPaste"
-         parameter="copy_gesture" />
-        <on_enable
-         function="Gesture.EnableAction"
-         parameter="copy_gesture" />
+            name="Settings Apply Local"
+            layout="topleft"
+            label="Apply Only To Myself">
+        <menu_item_call.on_click 
+                function="MyEnvironments.DoApply"
+                parameter="local" />
+    </menu_item_call>
+    <menu_item_call
+            name="Settings Apply Parcel"
+            layout="topleft"
+            label="Apply To Parcel">
+        <menu_item_call.on_click 
+                function="MyEnvironments.DoApply"
+                parameter="parcel" />
+        <menu_item_call.on_enable
+                function="MyEnvironments.CanAppyl" 
+                parameter="parcel"/>
+    </menu_item_call>
+    <menu_item_call
+            name="Settings Apply Region"
+            layout="topleft"
+            label="Apply To Region">
+        <menu_item_call.on_click 
+                function="MyEnvironments.DoToSelected"
+                parameter="region" />
+        <menu_item_call.on_enable
+                function="MyEnvironments.CanAppyl" 
+                parameter="region"/>
     </menu_item_call>
+    <menu_item_separator
+            layout="topleft" 
+            name="Separator" />
     <menu_item_call
-     label="Paste"
-     layout="topleft"
-     name="paste_settings">
+            label="Copy"
+            layout="topleft"
+            name="copy_settings">
         <on_click
-         function="Gesture.Action.CopyPaste"
-         parameter="paste" />
+                function="MyEnvironments.CopyPaste"
+                parameter="copy" />
         <on_enable
-         function="Gesture.EnableAction"
-         parameter="paste" />
+                function="MyEnvironments.EnableAction"
+                parameter="copy" />
     </menu_item_call>
     <menu_item_call
-     label="Copy UUID"
-     layout="topleft"
-     name="copy_uuid">
+            label="Paste"
+            layout="topleft"
+            name="paste_settings">
         <on_click
-         function="Gesture.Action.CopyPaste"
-         parameter="copy_uuid" />
+                function="MyEnvironments.CopyPaste"
+                parameter="paste" />
         <on_enable
-         function="Gesture.EnableAction"
-         parameter="copy_uuid" />
+                function="MyEnvironments.EnableAction"
+                parameter="paste" />
     </menu_item_call>
     <menu_item_call
-     label="Edit"
-     layout="topleft"
-     name="edit_settings">
+            label="Copy UUID"
+            layout="topleft"
+            name="copy_uuid">
         <on_click
-         function="Gesture.Action.ShowPreview" />
+                function="MyEnvironments.CopyPaste"
+                parameter="copy_uuid" />
         <on_enable
-         function="Gesture.EnableAction"
-         parameter="edit_settings" />
+                function="MyEnvironments.EnableAction"
+                parameter="copy_uuid" />
     </menu_item_call>
 </toggleable_menu>
-- 
cgit v1.2.3


From 294793b9a983a0c26c0e82bd432d4cc311ecb1ba Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 10 Jul 2018 15:15:47 -0700
Subject: MAINT-8821: Tighten up floater.  Allow apply from gear menu.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_settings_gear.xml b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
index 41fd0fce2c..1d65ff3d99 100644
--- a/indra/newview/skins/default/xui/en/menu_settings_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
@@ -9,7 +9,7 @@
             layout="topleft"
             name="edit_settings">
         <on_click
-                function="MyEnvironments.ShowPreview" />
+                function="MyEnvironments.DoEdit" />
         <on_enable
                 function="MyEnvironments.EnableAction"
                 parameter="edit_settings" />
@@ -33,7 +33,7 @@
                 function="MyEnvironments.DoApply"
                 parameter="parcel" />
         <menu_item_call.on_enable
-                function="MyEnvironments.CanAppyl" 
+                function="MyEnvironments.CanApply" 
                 parameter="parcel"/>
     </menu_item_call>
     <menu_item_call
@@ -41,10 +41,10 @@
             layout="topleft"
             label="Apply To Region">
         <menu_item_call.on_click 
-                function="MyEnvironments.DoToSelected"
+                function="MyEnvironments.DoApply"
                 parameter="region" />
         <menu_item_call.on_enable
-                function="MyEnvironments.CanAppyl" 
+                function="MyEnvironments.CanApply" 
                 parameter="region"/>
     </menu_item_call>
     <menu_item_separator
-- 
cgit v1.2.3


From 939174416453a46a4a415f37ae642e5508c05787 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 16 Jul 2018 16:49:49 -0700
Subject: Add default and wellknown asset ids.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_settings_gear.xml b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
index 1d65ff3d99..ea8e328407 100644
--- a/indra/newview/skins/default/xui/en/menu_settings_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
@@ -12,7 +12,7 @@
                 function="MyEnvironments.DoEdit" />
         <on_enable
                 function="MyEnvironments.EnableAction"
-                parameter="edit_settings" />
+                parameter="edit" />
     </menu_item_call>
     <menu_item_separator
             layout="topleft" 
-- 
cgit v1.2.3


From 1abea33b7012b6b00502620dab92cc39eacb1d50 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 18 Jul 2018 14:13:29 +0300
Subject: MAINT-8334 EEP UI control: Virtual Trackball

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  |  8 +--
 .../default/xui/en/panel_settings_sky_sunmoon.xml  | 52 +++++++----------
 .../default/xui/en/widgets/sun_moon_trackball.xml  | 68 ++++++++++++++++++++++
 3 files changed, 94 insertions(+), 34 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index fb53eb969b..aac2084543 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -6,7 +6,7 @@
         save_rect="true"
         title="Edit Day Cycle"
         width="705"
-        height="602"
+        height="650"
         min_width="450"
         min_height="85"
         can_resize="true">
@@ -22,7 +22,7 @@
 
     <layout_stack name="outer_stack"
             width="705"
-            height="602"
+            height="650"
             follows="all"
             animate="false"
             top="0"
@@ -450,14 +450,14 @@
                 <layout_panel name="frame_settings_water"
                         auto_resize="true"
                         user_resize="true"
-                        height="420"
+                        height="500"
                         width="700"
                         min_height="0"
                         visible="true">
                     <tab_container
                             follows="all"
                             halign="left"
-                            height="420"
+                            height="430"
                             layout="topleft"
                             left="0"
                             name="water_tabs"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 1323ad6a17..a951e39697 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -21,7 +21,7 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="75">
+                height="350">
             <text
                     follows="left|top"
                     height="10"
@@ -117,7 +117,7 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="75">
+                height="350">
             <layout_stack 
                     left="5"
                     top="5"
@@ -131,7 +131,7 @@
                         auto_resize="true"
                         user_resize="true"
                         visible="true"
-                        height="75">
+                        height="220">
                     <text
                             follows="left|top"
                             height="10"
@@ -151,23 +151,19 @@
                             width="100">
                         Position:
                     </text>
-                    <joystick_quat
-                            follows="left|top"
-                            height="78"
-                            layout="topleft"
-                            left_delta="0"
-                            top_delta="20"
-                            name="sun_rotation"
-                            quadrant="left"
-                            sound_flags="3"
-                            visible="true"
-                            tool_tip="Move sun in sky"
-                            width="78" /> <!-- Should be 126x126 -->
+                    <sun_moon_trackball
+                        name="sun_rotation"
+                        follows="left|top"
+                        left_delta="0"
+                        top_delta="20"
+                        height="150"
+                        width="150"
+                        thumb_mode="sun" />
                     <text
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="100"
+                            left_delta="160"
                             top_delta="-20"
                             width="200">
                         Image:
@@ -186,7 +182,7 @@
                         auto_resize="true"
                         user_resize="true"
                         visible="true"
-                        height="75">
+                        height="220">
                     <text
                             follows="left|top"
                             height="10"
@@ -206,23 +202,19 @@
                             width="100">
                         Position:
                     </text>
-                    <joystick_quat
-                            follows="left|top"
-                            height="78"
-                            layout="topleft"
-                            left_delta="0"
-                            top_delta="20"
-                            name="moon_rotation"
-                            quadrant="left"
-                            sound_flags="3"
-                            visible="true"
-                            tool_tip="Move sun in sky"
-                            width="78" /> <!-- Should be 126x126 -->
+                    <sun_moon_trackball
+                        name="moon_rotation"
+                        follows="left|top"
+                        left_delta="0"
+                        top_delta="20"
+                        height="150"
+                        width="150"
+                        thumb_mode="moon" />
                     <text
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="100"
+                            left_delta="160"
                             top_delta="-20"
                             width="200">
                         Image:
diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
new file mode 100644
index 0000000000..68681b8228
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<sun_moon_trackball
+    name="virtualtrackball"
+    width="150"
+    height="150"
+    user_resize="false"     
+    increment_angle_mouse="0.5f"
+    increment_angle_btn="3.0f"    
+    image_sphere="VirtualTrackball_Sphere"
+    image_moon_back="VirtualTrackball_Moon_Back"
+    image_moon_front="VirtualTrackball_Moon_Front"
+    image_sun_back="VirtualTrackball_Sun_Back"
+    image_sun_front="VirtualTrackball_Sun_Front">
+
+    <sun_moon_trackball.border
+        visible="true"/>
+
+    <sun_moon_trackball.labelN
+        font="SansSerif"
+        name="labelN"
+        valign="bottom"
+        halign="left"
+        label="N"/>
+    <sun_moon_trackball.labelS
+        font="SansSerif"
+        name="labelS"
+        valign="top"
+        halign="left"
+        label="S"/>
+    <sun_moon_trackball.labelW
+        font="SansSerif"
+        name="labelW"
+        valign="top"
+        halign="right"
+        label="W"/>
+    <sun_moon_trackball.labelE
+        font="SansSerif"
+        name="labelE"
+        valign="top"
+        halign="left"
+        label="E"/>
+
+    <sun_moon_trackball.button_rotate_top
+        name="btn_rotate_top"
+        image_unselected="VirtualTrackball_Rotate_Top"
+        image_selected="VirtualTrackball_Rotate_Top"
+        image_disabled="VirtualTrackball_Rotate_Top" />
+
+    <sun_moon_trackball.button_rotate_bottom
+        name="btn_rotate_bottom"
+        image_unselected="VirtualTrackball_Rotate_Bottom"
+        image_selected="VirtualTrackball_Rotate_Bottom"
+        image_disabled="VirtualTrackball_Rotate_Bottom" />
+
+    <sun_moon_trackball.button_rotate_left
+        name="btn_rotate_left"
+        image_unselected="VirtualTrackball_Rotate_Left"
+        image_selected="VirtualTrackball_Rotate_Left"
+        image_disabled="VirtualTrackball_Rotate_Left" />
+
+    <sun_moon_trackball.button_rotate_right
+        name="btn_rotate_right"
+        image_unselected="VirtualTrackball_Rotate_Right"
+        image_selected="VirtualTrackball_Rotate_Right"
+        image_disabled="VirtualTrackball_Rotate_Right" />
+
+</sun_moon_trackball>
+
-- 
cgit v1.2.3


From 80f98daed9aaf74f2d6fa3da9c1525ebcd4293c2 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 19 Jul 2018 22:27:49 +0300
Subject: MAINT-8842 Should not be able to add Environment Setting Assets to
 Group Notices on a Non-EEP region

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 74171a86cc..c0481d1a28 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -315,6 +315,17 @@ Please try logging in again in a minute.</string>
 	<string name="BUTTON_DOCK">Dock</string>
 	<string name="BUTTON_HELP">Show Help</string>
 
+	<!-- ToolTips for notecards -->
+	<string name="TooltipNotecardNotAllowedTypeDrop">
+Items of this type can't be attached
+to notecards on this region.
+	</string>
+	<string name="TooltipNotecardOwnerRestrictedDrop">
+Only items with unrestricted
+'next owner' permissions
+"can be attached to notecards.
+	</string>
+
 	<!-- searching - generic -->
 	<string name="Searching">Searching...</string>
 	<string name="NoneFound">None found.</string>
-- 
cgit v1.2.3


From c822d8af16428cf245ae57305a4f39d3fccd672b Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 20 Jul 2018 19:10:22 +0300
Subject: MAINT-8344 implement slider support for an overlap threshold and
 reenable shift-copy

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index aac2084543..caf7153a5c 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -219,7 +219,8 @@
                                 draw_track="false"
                                 follows="bottom"
                                 height="10"
-                                increment="0.01"
+                                increment="0.005"
+                                overlap_threshold="0.026"
                                 initial_value="0"
                                 layout="topleft"
                                 left="10"
@@ -235,7 +236,8 @@
                                 decimal_digits="0"
                                 follows="bottom"
                                 height="10"
-                                increment="0.01"
+                                increment="0.005"
+                                overlap_threshold="0.026"
                                 initial_value="0"
                                 layout="topleft"
                                 left="10"
-- 
cgit v1.2.3


From c24cbff2ab2a5f4b78ce10deb5122453f5849b68 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 30 Jul 2018 18:04:35 +0300
Subject: MAINT-8830 EEP rename "Default Environment" option in About Land >
 Environment

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

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

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 21518338ff..e469143e41 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -48,9 +48,9 @@
                             max_width="200"
                             width="200">
                         <radio_item
-                                label="Default Environment"
+                                label="Use Region Settings"
                                 layout="topleft"
-                                name="use_default_setting"
+                                name="use_region_setting"
                                 height="20"/>
                         <radio_item
                                 label="Custom Environment"
-- 
cgit v1.2.3


From dfe3757236f28c80142d13b65a191f797f4488a7 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 30 Jul 2018 18:38:59 +0300
Subject: MAINT-8879 EEP Make image swatches square

---
 indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml  | 2 +-
 indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml | 4 ++--
 indra/newview/skins/default/xui/en/panel_settings_water.xml       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index b4c3089942..412ed8bf82 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -120,7 +120,7 @@
                 Cloud Image:
             </text>
             <texture_picker
-                    height="100"
+                    height="123"
                     layout="topleft"
                     left_delta="5"
                     name="cloud_map"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index a951e39697..15d20e46b7 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -169,7 +169,7 @@
                         Image:
                     </text>
                     <texture_picker
-                            height="100"
+                            height="123"
                             layout="topleft"
                             left_delta="5"
                             name="sun_image"
@@ -220,7 +220,7 @@
                         Image:
                     </text>
                     <texture_picker
-                            height="100"
+                            height="123"
                             layout="topleft"
                             left_delta="5"
                             name="moon_image"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index c24a2dbbb6..0b03ec5cc0 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -167,12 +167,12 @@
                         Normal Map
                     </text>
                     <texture_picker
-                            height="75"
+                            height="84"
                             layout="topleft"
                             left_delta="0"
                             name="water_normal_map"
                             top_pad="5"
-                            width="75"/>
+                            width="61"/>
 
                     <text
                             follows="left|top"
-- 
cgit v1.2.3


From d7ae8a0d28483a8ed5d93152177aa655266f7004 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 30 Jul 2018 20:08:58 +0300
Subject: MAINT-8344 EEP Make arrows white

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 0b03ec5cc0..4c9ae57941 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -196,7 +196,7 @@
                         min_val_y="-4"
                         max_val_y="4"
                         increment_y="0.5f"
-                        arrow_color="red"/>
+                        arrow_color="white"/>
                     
                     <text
                             follows="left|top"
@@ -218,7 +218,7 @@
                         max_val_x="4"
                         min_val_y="-4"
                         max_val_y="4" 
-                        arrow_color="green"/>
+                        arrow_color="white"/>
 
                     <text
                             follows="left|top|right"
-- 
cgit v1.2.3


From a59170df0e7f0f431057938571eae589693d21f6 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 1 Aug 2018 20:27:47 +0300
Subject: MAINT-8905 EEP - tracks should show altitudes

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index caf7153a5c..50212fdf80 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -17,9 +17,11 @@
     <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>
 
-    <!-- Todo: These 5 strings might be subjected to a change to get dynamic labels, consider using layout_stack to get dynamic width adjustment-->
+    <!-- Substitutions -->
     <string name="time_label"> ([HH]:[MM])</string>
+    <string name="sky_track_label">Sky [ALT]</string>
 
+    <!-- Layout -->
     <layout_stack name="outer_stack"
             width="705"
             height="650"
-- 
cgit v1.2.3


From 6a54e0948d651963399da82cfc5672125b9442e7 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 8 Aug 2018 03:28:37 +0300
Subject: MAINT-8900 LLVirtualTrackball improvement: added click-to-set mode

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

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

diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
index 68681b8228..3a9655b317 100644
--- a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
+++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
@@ -4,7 +4,7 @@
     width="150"
     height="150"
     user_resize="false"     
-    increment_angle_mouse="0.5f"
+    increment_angle_mouse="1.5f"
     increment_angle_btn="3.0f"    
     image_sphere="VirtualTrackball_Sphere"
     image_moon_back="VirtualTrackball_Moon_Back"
-- 
cgit v1.2.3


From 51abc168c03f80d63c85d4bb48624f440b585390 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 3 Aug 2018 21:01:43 +0300
Subject: MAINT-8902 fix encroaching 'legacy' issues

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 50212fdf80..5e38a289c9 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -240,6 +240,7 @@
                                 height="10"
                                 increment="0.005"
                                 overlap_threshold="0.026"
+                                loop_overlap="true"
                                 initial_value="0"
                                 layout="topleft"
                                 left="10"
-- 
cgit v1.2.3


From 7da3a1eb4f14b67c698977eb1947ce06a312d507 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 6 Aug 2018 17:49:50 +0100
Subject: WIP check-in to allow merge of upstream changes.

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  |   9 ++
 .../default/xui/en/panel_settings_sky_density.xml  |  32 ++++
 .../skins/default/xui/en/widgets/density_ctrl.xml  | 164 +++++++++++++++++++++
 3 files changed, 205 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/density_ctrl.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index caf7153a5c..80e58c8248 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -526,6 +526,15 @@
                                 left_delta="0"
                                 top_pad="5"
                                 name="moon_panel" />
+                      <panel
+                                border="true"
+                                class="panel_settings_density"
+                                filename="panel_settings_sky_density.xml"
+                                label="Advanced Atmospherics"
+                                layout="topleft"
+                                left_delta="0"
+                                top_pad="5"
+                                name="advanced_atmo_panel" />
                     </tab_container>
                 </layout_panel>        
             </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
new file mode 100644
index 0000000000..05bd3c336a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="all"
+ label="Density"
+ name="panel_settings_sky_density"
+ layout="topleft"
+ left="0"
+ top="0"
+ width="320"
+ height="240">
+<tab_container>
+  <panel>
+    name="panel_settings_sky_density_rayleigh"
+    <densityctrl>
+      name = "density_rayleigh"
+    </densityctrl>
+  </panel>
+  <panel>
+    name="panel_settings_sky_density_mie"
+    <densityctrl>
+      name = "density_mie"
+    </densityctrl>
+  </panel>
+  <panel>    
+    name="panel_settings_sky_density_absorption"
+    <densityctrl>
+       name = "density_absorption"
+    </densityctrl>
+  </panel>
+</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
new file mode 100644
index 0000000000..0f3f0159db
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<densityctrl
+ border="true"
+ follows="all"
+ label="Density"
+ name="density_ctrl"
+ layout="topleft"
+ left="0"
+ top="0"
+ width="320"
+ height="240">
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="-5"
+     width="120">
+Exponential Term
+    </text>
+    <slider
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="0"
+     max_val="1"
+     name="level_exponential"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <view
+     left_pad="15"
+     top="15"
+     name="preview_image"
+     height="140"
+     width="140"
+     follows="left|top"
+    />
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="-5"
+     width="120">
+Exponential Scale Factor
+    </text>
+    <slider
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="0"
+     max_val="1"
+     name="exponential_scale"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="-5"
+     width="120">
+Linear Term
+    </text>
+    <slider
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="0"
+     max_val="1"
+     name="level_linear"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="-5"
+     width="120">
+Constant Term
+    </text>
+    <slider
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="0"
+     max_val="1"
+     name="level_constant"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="15"
+     width="80">
+Max Altitude
+    </text>
+    <slider
+     decimal_digits="0"
+     follows="left|top"
+     height="16"
+     increment="1"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="1000"
+     max_val="40000"
+     name="max_altitude"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     name="aniso_factor_label"
+     left="15"
+     top_pad="15"
+     width="80">
+Anisotropy Factor
+    </text>
+    <slider
+     decimal_digits="0"
+     follows="left|top"
+     height="16"
+     increment="1"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="1000"
+     max_val="40000"
+     name="aniso_factor"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+</densityctrl>
-- 
cgit v1.2.3


From cd5f7b2c03e87cc5d236eaa5b8c025530571376a Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 6 Aug 2018 15:37:09 -0700
Subject: MAINT-7703: Estate and region flags for parcel environmests (not
 written to DB yet)

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

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

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 e469143e41..41f58eef01 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -150,7 +150,6 @@
                 min_height="0"
                 background_visible="false">
     <check_box
-        control_name="may_override_chk"
         height="16"
         label="Parcel Owners May Override"
         layout="topleft"
-- 
cgit v1.2.3


From 7a001186b3063c36a78b2537b81c75124e307ff7 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 9 Aug 2018 16:36:44 -0700
Subject: Adjust layout of sunmoon panel and size of ext day edit. Blank sun
 texture. Fix edit and transition in edit day cycle. Fix default and blank
 images in sky textures.

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  |  12 +--
 .../default/xui/en/panel_settings_sky_sunmoon.xml  | 116 ++++++++++-----------
 2 files changed, 60 insertions(+), 68 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 5e38a289c9..e3cd72c39d 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -7,8 +7,8 @@
         title="Edit Day Cycle"
         width="705"
         height="650"
-        min_width="450"
-        min_height="85"
+        min_width="705"
+        min_height="650"
         can_resize="true">
 
     <!-- obsolete?, add as hint for 'save' button? -->
@@ -455,14 +455,14 @@
                 <layout_panel name="frame_settings_water"
                         auto_resize="true"
                         user_resize="true"
-                        height="500"
+                        height="420"
                         width="700"
                         min_height="0"
-                        visible="true">
+                        visible="false">
                     <tab_container
                             follows="all"
                             halign="left"
-                            height="430"
+                            height="420"
                             layout="topleft"
                             left="0"
                             name="water_tabs"
@@ -488,7 +488,7 @@
                         height="420"
                         width="700"
                         min_height="0"
-                        visible="false">
+                        visible="true">
                     <tab_container
                             follows="all"
                             halign="left"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 15d20e46b7..2b79a1056f 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -28,8 +28,51 @@
                     layout="topleft"
                     left_delta="15"
                     top_pad="15"
+                    font="SansSerifBold"
+                    width="120">
+                Sun &amp; Stars
+            </text>
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="10"
+                            top_delta="30"
+                            width="100">
+                        Position:
+                    </text>
+                    <sun_moon_trackball
+                        name="sun_rotation"
+                        follows="left|top"
+                        left_delta="0"
+                        top_delta="20"
+                        height="150"
+                        width="150"
+                        thumb_mode="sun" />
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="160"
+                            top_delta="-20"
+                            width="200">
+                        Image:
+                    </text>
+                    <texture_picker
+                            height="123"
+                            layout="topleft"
+                            left_delta="5"
+                            name="sun_image"
+                            top_pad="10"
+                            width="100"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="-5"
+                    top_delta="110"
                     width="80">
-                Sun Color:
+                Color:
             </text>
             <color_swatch
                     can_apply_immediately="true"
@@ -37,7 +80,7 @@
                     height="37"
                     label_height="0"
                     layout="topleft"
-                    left_delta="0"
+                    left_delta="5"
                     name="sun_moon_color"
                     top_pad="5"
                     width="60" />
@@ -45,8 +88,8 @@
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="0"
-                    top_delta="57"
+                    left_delta="-160"
+                    top_delta="47"
                     width="200">
                 Glow Focus:
             </text>
@@ -61,15 +104,15 @@
                     min_val="0"
                     max_val="0.5"
                     name="glow_focus"
-                    top_delta="20"
-                    width="200"
+                    top_delta="15"
+                    width="250"
                     can_edit_text="true"/>
             <text
                     follows="left|top"
                     height="10"
                     layout="topleft"
                     left_delta="-5"
-                    top_delta="20"
+                    top_delta="22"
                     width="200">
                 Glow Size:
             </text>
@@ -84,8 +127,8 @@
                     min_val="1"
                     max_val="1.99"
                     name="glow_size"
-                    top_delta="20"
-                    width="200"
+                    top_delta="15"
+                    width="250"
                     can_edit_text="true"/>
             <text
                     follows="left|top"
@@ -107,8 +150,8 @@
                     min_val="0"
                     max_val="2"
                     name="star_brightness"
-                    top_delta="20"
-                    width="200"
+                    top_delta="15"
+                    width="250"
                     can_edit_text="true"/>
         </layout_panel>
         <layout_panel
@@ -125,57 +168,6 @@
                     bottom="-5"
                     follows="left|top|right|bottom"
                     orientation="vertical">
-                <layout_panel
-                        border="true"
-                        bevel_style="in"
-                        auto_resize="true"
-                        user_resize="true"
-                        visible="true"
-                        height="220">
-                    <text
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="15"
-                            top_pad="15"
-                            font="SansSerifBold"
-                            width="80">
-                        Sun
-                    </text>
-                    <text
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="10"
-                            top_delta="30"
-                            width="100">
-                        Position:
-                    </text>
-                    <sun_moon_trackball
-                        name="sun_rotation"
-                        follows="left|top"
-                        left_delta="0"
-                        top_delta="20"
-                        height="150"
-                        width="150"
-                        thumb_mode="sun" />
-                    <text
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="160"
-                            top_delta="-20"
-                            width="200">
-                        Image:
-                    </text>
-                    <texture_picker
-                            height="123"
-                            layout="topleft"
-                            left_delta="5"
-                            name="sun_image"
-                            top_pad="10"
-                            width="100"/>
-                </layout_panel>
                 <layout_panel
                         border="true"
                         bevel_style="in"
-- 
cgit v1.2.3


From eadf0b910174274e7c83fe37e417f576a7350edb Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 15 Aug 2018 13:35:53 -0700
Subject: MAINT-8990, MAINT-9002: First pass rework on environment panels,
 region/parcel

---
 .../skins/default/xui/en/floater_about_land.xml    |   4 +-
 .../default/xui/en/panel_region_environment.xml    | 184 +++++++++++----------
 2 files changed, 103 insertions(+), 85 deletions(-)

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

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 334de8e3db..37c4e3ff8d 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -2106,7 +2106,7 @@ Only large parcels can be listed in search.
           top="0"
           help_topic="land_experiences_tab"
           name="land_experiences_panel"
-            class="land_experiences_panel"
+          class="land_experiences_panel"
           filename="panel_region_experiences.xml">
        </panel>
        <panel
@@ -2118,7 +2118,7 @@ Only large parcels can be listed in search.
           top="0"
           help_topic="land_environment_tab"
           name="land_environment_panel"
-            class="land_environment_panel"
+          class="land_environment_panel"
           filename="panel_region_environment.xml">
        </panel>
     </tab_container>
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 41f58eef01..c1cfe79ba4 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -1,82 +1,109 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <panel
-    border="true"
-    follows="top|left"
-    height="300"
-    label="Environment"
-    layout="topleft"
-    help_topic="panel_region_environment_tab"
-    name="panel_env_info"
-    width="530"> 
+        border="true"
+        follows="top|left"
+        height="300"
+        label="Environment"
+        layout="topleft"
+        help_topic="panel_region_environment_tab"
+        name="panel_env_info"
+        width="420"> 
+    <string name="str_label_use_default">Use Default Settings</string>
+    <string name="str_label_use_region">Use Region Settings</string>
+    <string name="str_unknow_inventory">Unknown</string>
+
     <layout_stack 
-            left_offset="0"
-            top_offset="0"
             width="420"
-            height="250"
+            height="450"
             follows="left|right|top|bottom"
             orientation="vertical">
         <layout_panel 
-                auto_resize="false"
-                user_resize="true"
-                bg_alpha_color="red"
-                min_height="130"
-                background_visible="false">
+                auto_resize="true"
+                user_resize="false">
             <layout_stack 
-                    left_offset="5"
-                    top_offset="5"
-                    right_offset="-5"
+                    left="5"
+                    top="5"
+                    right="-5"
                     follows="left|right|top|bottom"
                     orientation="horizontal">
                 <layout_panel 
+                        background_visible="true"
                         border="true"
                         bevel_style="in"
-                        auto_resize="false"
+                        auto_resize="true"
                         user_resize="false"
-                        width="160"
-                        background_visible="true">
+                        width="260"
+                        min_width="260">
                     <text follows="top|left"
+                            font="SansSerif"
                             halign="left"
-                            text_color="white">Environment Source</text>
+                            text_color="white">Current Environment</text>
                     <radio_group
-                            follows="top|left"
-                            height="45"
+                            height="90"
                             layout="topleft"
+                            top_pad="5"
                             left_delta="10"
-                            name="environment_select_radio_group"
-                            bottom_delta="50"
-                            max_width="200"
-                            width="200">
+                            name="rdg_environment_select">
                         <radio_item
-                                label="Use Region Settings"
+                                label="[USEDEFAULT]"
                                 layout="topleft"
-                                name="use_region_setting"
+                                name="rdo_use_xxx_setting"
                                 height="20"/>
                         <radio_item
+                                label="Settings From Inventory"
+                                layout="topleft"
+                                valign="top"
+                                name="rdo_use_inv_setting"
+                                height="20"/>
+                        <radio_item
+                                top_pad="25"
                                 label="Custom Environment"
                                 layout="topleft"
                                 height="20"
-                                name="use_custom_setting"/>
+                                name="rdo_use_custom_setting"/>
                     </radio_group>
+                    <line_editor
+                            follows="top|left"
+                            enabled="false"
+                            left_delta="20"
+                            top_delta="50"
+                            height="20"
+                            layout="topleft"
+                            name="edt_inventory_name"
+                            width="200">
+                        Unknown
+                    </line_editor>
                     <button
-                            follows="top|right"
+                            name="btn_select_inventory"
+                            follows="top|left"
+                            image_overlay="Command_Inventory_Icon"
+                            auto_resize="false"
+                            layout="topleft"
+                            height="20"
+                            width="20"
+                            left_delta="205"
+                            top_delta="0"/>
+                    <button
+                            follows="top|left"
+                            top_pad="25"
+                            left_delta="-205"
+                            layout="topleft"
                             height="23"
-                            label="Edit Custom"
-                            right_offset="30"
-                            bottom_offset="30"
-                            width="100"
-                            name="edit_btn"/>
+                            label="Edit Environment"
+                            width="120"
+                            name="btn_edit"/>
 
                 </layout_panel>
                 <layout_panel 
                         border="true"
                         bevel_style="in"
-                        auto_resize="false"
-                        user_resize="true"
-                        height="11"
-                        width="220"
+                        auto_resize="true"
+                        user_resize="false"
                         background_visible="true">
-                    <text follows="top|left|right"
+                    <text 
+                            font="SansSerif"
+                            follows="top|left|right"
                             halign="left"
                             text_color="white">Day Settings</text>
                     <text
@@ -101,10 +128,10 @@
                             layout="topleft"
                             left_delta="0"
                             top_pad="6"
-                            name="day_length_sld"
+                            name="sld_day_length"
                             min_val="4"
                             max_val="178"
-                            width="200" />
+                            width="180" />
                     <text
                             type="string"
                             length="1"
@@ -127,53 +154,44 @@
                             layout="topleft"
                             left_delta="0"
                             top_pad="6"
-                            name="day_offset_sld"
+                            name="sld_day_offset"
                             min_val="-12"
                             max_val="12"
-                            width="200" />
+                            width="180" />
 
                 </layout_panel>
-                <layout_panel name="flex"
-                        auto_resize="true"
-                        user_resize="true"
-                        visible="false"
-                        bg_alpha_color="blue"
-                        height="100"
-                        background_visible="true">
-                </layout_panel>
             </layout_stack>
         </layout_panel>
         <layout_panel 
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 height="21"
-                min_height="0"
-                background_visible="false">
-    <check_box
-        height="16"
-        label="Parcel Owners May Override"
-        layout="topleft"
-        left_offset="10"
-        top_offset="10"
-        name="allow_override_chk"
-        width="200" />
-    <button
-        follows="top|left"
-        height="23"
-        label="Apply"
-        left_offset="160"
-        top_offset="60"
-        name="apply_btn"
-        width="100" />
-    <button
-        follows="top|left"
-        height="23"
-        label="Cancel"
-        layout="topleft"
-        left_pad="10"
-        name="cancel_btn"
-        width="100" /> 
-                
+                min_height="0">
+            <check_box
+                    height="20"
+                    label="Parcel Owners May Override Environment"
+                    layout="topleft"
+                    left="10"
+                    top="10"
+                    name="chk_allow_override"
+                    width="200" />
+            <button
+                    follows="top|left"
+                    height="23"
+                    label="Apply"
+                    top_pad="10"
+                    name="btn_apply"
+                    width="100" />
+            <button
+                    follows="top|left"
+                    height="23"
+                    label="Reset"
+                    layout="topleft"
+                    left_pad="10"
+                    top_delta="0"
+                    name="btn_cancel"
+                    width="100" /> 
+
         </layout_panel>
     </layout_stack>
 </panel>
-- 
cgit v1.2.3


From 7f25bef9c4bd5bf277331040711f13eb69b9c6d1 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 16 Aug 2018 16:27:53 -0700
Subject: MAINT-7703: Estate level switch turns of parcel environments.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9d406a14e1..f011fe0aaa 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4797,6 +4797,18 @@ Unchecking this option may remove restrictions that parcel owners have added to
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="EstateParcelEnvironmentOverride"
+   type="alertmodal">
+Unchecking this option may remove any custom environments that parcel owners have added to their parcels. Please discuss with your parcel owners as needed.
+    <tag>confirm</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+  
+  
   <notification
    icon="alertmodal.tga"
    name="RegionEntryAccessBlocked"
-- 
cgit v1.2.3


From 1716129fd23ff35e030808406af1a8f796dc4b01 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 17 Aug 2018 12:35:42 -0700
Subject: MAINT-8826, MAINT-8990, MAINT-9002, MAINT-7703: Rework for
 environment pannels in Region/Estate and Parcel. Enable/disable by
 permission. Edit the correct environment.  Dirty flags for changes. Estate
 owner disallow switch.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_save_settings.xml b/indra/newview/skins/default/xui/en/menu_save_settings.xml
index a72b02c593..e3ed9a1741 100644
--- a/indra/newview/skins/default/xui/en/menu_save_settings.xml
+++ b/indra/newview/skins/default/xui/en/menu_save_settings.xml
@@ -19,6 +19,13 @@
                 function="FlyoutCombo.Button.Action"
                 userdata="saveas" />
     </menu_item_call>
+    <menu_item_call
+            name="commit_changes"
+            label="Commit">
+        <menu_item_call.on_click 
+                function="FlyoutCombo.Button.Action"
+                userdata="commit" />
+    </menu_item_call>
     <menu_item_call
             name="apply_local"
             label="Apply Only To Myself">
-- 
cgit v1.2.3


From 1e3ee272ae811b862a529b6f3bbebb50a0c22580 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 17 Aug 2018 15:37:10 -0700
Subject: Add an apparent time of day.  More OSX complaints.

---
 .../default/xui/en/panel_region_environment.xml    | 25 ++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

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

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 c1cfe79ba4..bb10e0c69e 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -119,7 +119,6 @@
                     </text>
                     <slider
                             can_edit_text="true"
-                            control_name="DayLengthSLD"
                             decimal_digits="1"
                             follows="left|top"
                             height="20"
@@ -145,7 +144,6 @@
                     </text>
                     <slider
                             can_edit_text="true"
-                            control_name="DayOffsetSLD"
                             decimal_digits="1"
                             follows="left|top"
                             height="20"
@@ -158,6 +156,29 @@
                             min_val="-12"
                             max_val="12"
                             width="180" />
+                    <text
+                            type="string"
+                            length="1"
+                            follows="left|top"
+                            height="12"
+                            layout="topleft"
+                            left_delta="0"
+                            top_pad="20"
+                            width="200">
+                        Apparent Time of Day Would Be:
+                    </text>
+                    <text
+                            name="lbl_apparent_time"
+                            type="string"
+                            length="1"
+                            follows="left|top"
+                            height="12"
+                            layout="topleft"
+                            left_delta="10"
+                            top_pad="5"
+                            width="200">
+                        [HH]:[MM][AP] ([PRC]%)
+                    </text>
 
                 </layout_panel>
             </layout_stack>
-- 
cgit v1.2.3


From 477c66c890d5d87318705415315aaf9464bec2ff Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 21 Aug 2018 11:37:59 -0700
Subject: Lest couple nullptr checks and disable the controls on legacy
 regions.

---
 .../default/xui/en/panel_region_environment.xml    | 24 +++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

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

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 bb10e0c69e..3a1a8c432a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -18,9 +18,26 @@
             height="450"
             follows="left|right|top|bottom"
             orientation="vertical">
+        <layout_panel
+                auto_resize="true"
+                user_resize="false"
+                name="pnl_environment_disabled"
+                visible="false">
+            <text follows="top|left|bottom|right"
+                            font="SansSerif"
+                            halign="center"
+                            valign="top"
+                            top_pad="20"
+                            text_color="white">
+Parcel environmental settings are 
+disabled on legacy regions.
+            </text>
+        </layout_panel>
         <layout_panel 
                 auto_resize="true"
-                user_resize="false">
+                user_resize="false"
+                name="pnl_environment_config"
+                visible="true">
             <layout_stack 
                     left="5"
                     top="5"
@@ -165,7 +182,7 @@
                             left_delta="0"
                             top_pad="20"
                             width="200">
-                        Apparent Time of Day Would Be:
+                        Apparent Time of Day:
                     </text>
                     <text
                             name="lbl_apparent_time"
@@ -187,7 +204,8 @@
                 auto_resize="true"
                 user_resize="false"
                 height="21"
-                min_height="0">
+                min_height="0"
+                name="pnl_environment_buttons">
             <check_box
                     height="20"
                     label="Parcel Owners May Override Environment"
-- 
cgit v1.2.3


From 4859db1adabcf84b959ff0603f1bb8401232164c Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 21 Aug 2018 15:59:18 -0700
Subject: MAINT-9026: Adding scale for sun and moon.  Also don't allow the user
 to directly set the radio buttons for inventory and custom.

---
 .../default/xui/en/panel_settings_sky_sunmoon.xml  | 130 ++++++++++++++-------
 1 file changed, 88 insertions(+), 42 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 2b79a1056f..586aff4bb8 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -32,39 +32,39 @@
                     width="120">
                 Sun &amp; Stars
             </text>
-                    <text
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="10"
-                            top_delta="30"
-                            width="100">
-                        Position:
-                    </text>
-                    <sun_moon_trackball
-                        name="sun_rotation"
-                        follows="left|top"
-                        left_delta="0"
-                        top_delta="20"
-                        height="150"
-                        width="150"
-                        thumb_mode="sun" />
-                    <text
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="160"
-                            top_delta="-20"
-                            width="200">
-                        Image:
-                    </text>
-                    <texture_picker
-                            height="123"
-                            layout="topleft"
-                            left_delta="5"
-                            name="sun_image"
-                            top_pad="10"
-                            width="100"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="10"
+                    top_delta="30"
+                    width="100">
+                Position:
+            </text>
+            <sun_moon_trackball
+                    name="sun_rotation"
+                    follows="left|top"
+                    left_delta="0"
+                    top_delta="20"
+                    height="150"
+                    width="150"
+                    thumb_mode="sun" />
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="160"
+                    top_delta="-20"
+                    width="200">
+                Image:
+            </text>
+            <texture_picker
+                    height="123"
+                    layout="topleft"
+                    left_delta="5"
+                    name="sun_image"
+                    top_pad="10"
+                    width="100"/>
             <text
                     follows="left|top"
                     height="10"
@@ -72,6 +72,29 @@
                     left_delta="-5"
                     top_delta="110"
                     width="80">
+                Scale:
+            </text>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.25"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0.25"
+                    max_val="20"
+                    name="sun_scale"
+                    top_delta="15"
+                    width="130"
+                    can_edit_text="true"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="-5"
+                    top_delta="20"
+                    width="80">
                 Color:
             </text>
             <color_swatch
@@ -89,7 +112,7 @@
                     height="10"
                     layout="topleft"
                     left_delta="-160"
-                    top_delta="47"
+                    top_delta="27"
                     width="200">
                 Glow Focus:
             </text>
@@ -135,7 +158,7 @@
                     height="10"
                     layout="topleft"
                     left_delta="-5"
-                    top_delta="30"
+                    top_delta="22"
                     width="200">
                 Star Brightness:
             </text>
@@ -195,13 +218,13 @@
                         Position:
                     </text>
                     <sun_moon_trackball
-                        name="moon_rotation"
-                        follows="left|top"
-                        left_delta="0"
-                        top_delta="20"
-                        height="150"
-                        width="150"
-                        thumb_mode="moon" />
+                            name="moon_rotation"
+                            follows="left|top"
+                            left_delta="0"
+                            top_delta="20"
+                            height="150"
+                            width="150"
+                            thumb_mode="moon" />
                     <text
                             follows="left|top"
                             height="10"
@@ -218,6 +241,29 @@
                             name="moon_image"
                             top_pad="10"
                             width="100"/>
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_delta="110"
+                            width="80">
+                        Scale:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.25"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0.25"
+                            max_val="20"
+                            name="sun_scale"
+                            top_delta="15"
+                            width="130"
+                            can_edit_text="true"/>
                 </layout_panel>
             </layout_stack>
         </layout_panel>
-- 
cgit v1.2.3


From 84cff0eca2f2d98d1c4bced78f4a163fd6aab7ff Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 22 Aug 2018 10:39:17 -0700
Subject: MAINT-8877: Fix the XML to fix the sizes of the dialogs.  (also
 enforce single instance)

---
 .../skins/default/xui/en/floater_edit_ext_day_cycle.xml       |  5 +++--
 .../newview/skins/default/xui/en/floater_fixedenvironment.xml | 11 +++++------
 .../newview/skins/default/xui/en/panel_region_environment.xml |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index e3cd72c39d..dd0048e8f8 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -3,13 +3,14 @@
         layout="topleft"
         name="env_edit_extdaycycle"
         help_topic="day_presets"
-        save_rect="true"
+        save_rect="false"
         title="Edit Day Cycle"
         width="705"
         height="650"
         min_width="705"
         min_height="650"
-        can_resize="true">
+        single_instance="true" 
+        can_resize="false">
 
     <!-- obsolete?, add as hint for 'save' button? -->
     <string name="title_new">Create a New Day Cycle</string>
diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index f88618fb71..36462dcd02 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -2,20 +2,19 @@
 <floater
         can_minimize="false"
         can_tear_off="false"
-        can_resize="true"
+        can_resize="false"
         can_drag_on_left="false"
         can_close="true"
-        can_dock="true"
+        can_dock="false"
         bevel_style="in"
-        height="500"
+        height="550"
         layout="topleft"
         name="Fixed Environment"
         save_rect="true"
         title="Fixed Environment"
-        save_dock_state="true"
-        save_visibility="true"
+        save_visibility="false"
         single_instance="true" 
-        width="650">
+        width="750">
     <layout_stack name="floater_stack"
             left="5"
             top="5"
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 3a1a8c432a..557e093f51 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -29,8 +29,8 @@
                             valign="top"
                             top_pad="20"
                             text_color="white">
-Parcel environmental settings are 
-disabled on legacy regions.
+No Parcel parcel is selected. Environmental 
+settings are disabled.
             </text>
         </layout_panel>
         <layout_panel 
-- 
cgit v1.2.3


From 28f311b7ffc807f712dc9bd853267eac85794b78 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 22 Aug 2018 11:55:36 -0700
Subject: Don't sun_scale twice. Should have been moon_scale.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 586aff4bb8..4b72bbbe0e 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -260,7 +260,7 @@
                             left_delta="5"
                             min_val="0.25"
                             max_val="20"
-                            name="sun_scale"
+                            name="moon_scale"
                             top_delta="15"
                             width="130"
                             can_edit_text="true"/>
-- 
cgit v1.2.3


From 9d3a5fef8fc0ec64f018ff6d4f0fca88fd9c33db Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 22 Aug 2018 15:12:27 -0700
Subject: MAINT-9034, MAINT-9035: Move the load frame button and change the
 lock icon to text.

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  | 48 +++++++++-------------
 1 file changed, 19 insertions(+), 29 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index dd0048e8f8..e553948d9d 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -401,8 +401,16 @@
                                 width="90"
                                 label="Add Frame"
                                 left_pad="175"
-                                top_delta="-12"
+                                top_delta="-20"
                                 name="add_frame" />
+                        <button
+                                follows="top|left"
+                                height="23"
+                                width="90"
+                                label="Load Frame"
+                                top_pad="0"
+                                left_delta="0"
+                                name="btn_load_frame" />
                         <button
                                 follows="left|top"
                                 height="23"
@@ -422,36 +430,18 @@
                         visible="true">
                     <!--bg_alpha_color="blue"
                 background_visible="true" -->
-                    <icon 
-                            border="1"
-                            bevel_style="out"
+                    <text
                             name="icn_lock_edit"
-                            layout="bottomleft"
                             follows="bottom"
-                            image_name="Locked_Icon"
-                            bottom="4"
-                            left="5"
-                            height="15"
-                            width="15"
-                            tab_stop="false" 
-                            visible="false"
-                            tool_tip="Select a key frame above to edit settings"/>
-                    <button
-                            name="btn_load_frame"
-                            follows="top"
-                            image_overlay="Command_Inventory_Icon"
-                            image_disabled="PushButton_Disabled"
-                            image_disabled_selected="PushButton_Disabled"
-                            image_selected="PushButton_Selected"
-                            image_unselected="PushButton_Off"
-                            hover_glow_amount="0.15"
-                            auto_resize="false"
-                            layout="topleft"
-                            height="30"
-                            width="30"
-                            left="25"
-                            top="1"
-                            tool_tip="Replace frame with settings from inventory"/>
+                            height="10"
+                            layout="bottomleft"
+                            left_delta="15"
+                            top_pad="15"
+                            font="SansSerif"
+                            text_color="Yellow"
+                            width="500">
+Select a key frame from the timeline above to edit settings.
+                    </text>
                 </layout_panel>
                 <layout_panel name="frame_settings_water"
                         auto_resize="true"
-- 
cgit v1.2.3


From d965af2b0cbf62e2e1601f504e0d548da40aa742 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Fri, 24 Aug 2018 02:40:12 +0300
Subject: MAINT-9032 Virtual Track Ball improvements

---
 .../skins/default/xui/en/widgets/sun_moon_trackball.xml  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
index 3a9655b317..0e729c821a 100644
--- a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
+++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
@@ -43,26 +43,26 @@
     <sun_moon_trackball.button_rotate_top
         name="btn_rotate_top"
         image_unselected="VirtualTrackball_Rotate_Top"
-        image_selected="VirtualTrackball_Rotate_Top"
-        image_disabled="VirtualTrackball_Rotate_Top" />
+        image_selected="VirtualTrackball_Rotate_Top_Active"
+        image_disabled="Blank" />
 
     <sun_moon_trackball.button_rotate_bottom
         name="btn_rotate_bottom"
         image_unselected="VirtualTrackball_Rotate_Bottom"
-        image_selected="VirtualTrackball_Rotate_Bottom"
-        image_disabled="VirtualTrackball_Rotate_Bottom" />
+        image_selected="VirtualTrackball_Rotate_Bottom_Active"
+        image_disabled="Blank" />
 
     <sun_moon_trackball.button_rotate_left
         name="btn_rotate_left"
         image_unselected="VirtualTrackball_Rotate_Left"
-        image_selected="VirtualTrackball_Rotate_Left"
-        image_disabled="VirtualTrackball_Rotate_Left" />
+        image_selected="VirtualTrackball_Rotate_Left_Active"
+        image_disabled="Blank" />
 
     <sun_moon_trackball.button_rotate_right
         name="btn_rotate_right"
         image_unselected="VirtualTrackball_Rotate_Right"
-        image_selected="VirtualTrackball_Rotate_Right"
-        image_disabled="VirtualTrackball_Rotate_Right" />
+        image_selected="VirtualTrackball_Rotate_Right_Active"
+        image_disabled="Blank" />
 
 </sun_moon_trackball>
 
-- 
cgit v1.2.3


From d5f2267369d2695a8aec7c1d0cfa25954ae3c706 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 24 Aug 2018 11:59:28 -0700
Subject: Remove "Commit" from fixed editor.  Check isDirty() before replacing
 or closing fixed editor.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f011fe0aaa..2ab22cb565 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11183,5 +11183,19 @@ Settings are not supported on this region.
 Please move to a settings enabled region and retry your action.
   <tag>fail</tag>
   </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SettingsConfirmLoss"
+   type="alertmodal">
+You are about to lose the changes you have made to this [TYPE] named "[NAME]".
+Are you sure you want to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Are you sure you want to lose changes?"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
   
 </notifications>
-- 
cgit v1.2.3


From 0b3a4c75568a1648926c24463ed11cba53cfddb8 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 28 Aug 2018 18:18:36 +0300
Subject: MAINT-8910 FIXED EEP - clicking at settings embedded into notecard
 does nothing

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c0481d1a28..3a882a73d3 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2780,6 +2780,7 @@ If you continue to receive this message, please contact Second Life support for
 	<!-- Environment settings -->
 	<string name="LocalSettings">Local Settings</string>
 	<string name="RegionSettings">Region Settings</string>
+	<string name="NoEnvironmentSettings">This Region does not support environmental settings.</string>
 
 	<!-- panel classified -->
 	<string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string>
-- 
cgit v1.2.3


From 964a472461bed91b3efa383aaea34d425b96111d Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 29 Aug 2018 21:13:09 +0100
Subject: Hook up sky density panel to fixedenv and edit_ext_daycycle UI.

Fix retrieving LLSD for density configs (element not array) in density UI.

Tweak layout of sky density controls.
---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  |  4 +-
 .../default/xui/en/panel_settings_sky_density.xml  | 84 ++++++++++------------
 2 files changed, 41 insertions(+), 47 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index c3f94f9aa3..61299a43bd 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -524,11 +524,11 @@ Select a key frame from the timeline above to edit settings.
                                 border="true"
                                 class="panel_settings_density"
                                 filename="panel_settings_sky_density.xml"
-                                label="Advanced Atmospherics"
+                                label="Density"
                                 layout="topleft"
                                 left_delta="0"
                                 top_pad="5"
-                                name="sky_density_panel" />
+                                name="panel_settings_sky_density" />
                     </tab_container>
                 </layout_panel>        
             </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
index b97dfcd0fe..d82cdb30be 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -22,11 +22,11 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="28">
+                height="16">
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -35,53 +35,51 @@
                     max_val="1"
                     name="rayleigh_exponential"
                     label="Rayleigh Exponential Term:"
-                    top_delta="8"
+                    top_pad="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="1"
                     name="rayleigh_exponential_scale"
                     label="Rayleigh Exponential Scale:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="1"
                     name="rayleigh_linear"
                     label="Rayleigh Linear Term:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="1"
                     name="rayleigh_constant"
                     label="Rayleigh Constant Term:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
         </layout_panel>
         <layout_panel
@@ -90,11 +88,11 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="28">
+                height="18">
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -103,68 +101,65 @@
                     max_val="3.0"
                     name="mie_exponential"
                     label="Mie Exponential Term:"
-                    top_delta="8"
+                    top_pad="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
-                    min_val="0"
+                    min_val="-1"
                     max_val="1"
                     name="mie_exponential_scale"
                     label="Mie Exponential Scale:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="3.0"
                     name="mie_linear"
                     label="Mie Linear Term:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="10"
                     name="mie_constant"
                     label="Mie Constant Term:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0.2"
                     max_val="1.8"
                     name="mie_aniso_factor"
                     label="Mie Aniso Factor:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
         </layout_panel>
         <layout_panel
@@ -173,11 +168,11 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="28">
+                height="16">
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -186,53 +181,51 @@
                     max_val="1"
                     name="absorption_exponential"
                     label="Absorption Exponential Term:"
-                    top_delta="8"
+                    top_pad="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
-                    min_val="0"
+                    min_val="-1"
                     max_val="1"
                     name="absorption_exponential_scale"
                     label="Absorption Exponential Scale:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="1"
                     name="absorption_linear"
                     label="Absorption Linear Term:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="1"
                     name="absorption_constant"
                     label="Absorption Constant Term:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
         </layout_panel>
         <layout_panel
@@ -241,11 +234,11 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="16">
+                height="10">
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="1"
                     initial_value="0"
                     layout="topleft"
@@ -254,9 +247,10 @@
                     max_val="40000"
                     name="max_altitude"
                     label="Max Altitude:"
-                    top_delta="8"
+                    top_pad="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
         </layout_panel>
     </layout_stack>
-</panel>                
+</panel> 
-- 
cgit v1.2.3


From 52f949d71a57415e372381fffeb126d8939522be Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 29 Aug 2018 21:14:56 +0100
Subject: Fix range on rayleigh exponential scale factor to include negative
 values.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
index d82cdb30be..5159a2714e 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -46,7 +46,7 @@
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    min_val="0"
+                    min_val="-1"
                     max_val="1"
                     name="rayleigh_exponential_scale"
                     label="Rayleigh Exponential Scale:"
-- 
cgit v1.2.3


From a4c49904c67e123df0d8e1f68714cf13acfa1ffc Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 3 Sep 2018 19:32:22 +0300
Subject: MAINT-8989 Menu updates button instead of executing command

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  |  2 +-
 .../skins/default/xui/en/menu_save_settings.xml    | 54 ++++++++++++++--------
 2 files changed, 37 insertions(+), 19 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index e553948d9d..c8843db28b 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -538,7 +538,7 @@ Select a key frame from the timeline above to edit settings.
                     left="5"
                     top_pad="0"
                     name="save_btn"
-                    width="150" />
+                    width="156" />
 
             <button
                     follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/menu_save_settings.xml b/indra/newview/skins/default/xui/en/menu_save_settings.xml
index e3ed9a1741..84dacaa8b8 100644
--- a/indra/newview/skins/default/xui/en/menu_save_settings.xml
+++ b/indra/newview/skins/default/xui/en/menu_save_settings.xml
@@ -5,46 +5,64 @@
         mouse_opaque="false"
         name="save_settings_menu"
         width="120">
-    <menu_item_call 
+    <menu_item_check
             name="save_settings" 
             label="Save">
-        <menu_item_call.on_click 
+        <menu_item_check.on_check
+                function="FlyoutCombo.Button.Check"
+                userdata="save" />
+        <menu_item_check.on_click
                 function="FlyoutCombo.Button.Action"
                 userdata="save"/>
-    </menu_item_call>
-    <menu_item_call 
+    </menu_item_check>
+    <menu_item_check 
             name="save_as_new_settings" 
             label="Save As">
-        <menu_item_call.on_click 
+        <menu_item_check.on_check
+                function="FlyoutCombo.Button.Check"
+                userdata="saveas" />
+        <menu_item_check.on_click
                 function="FlyoutCombo.Button.Action"
                 userdata="saveas" />
-    </menu_item_call>
-    <menu_item_call
+    </menu_item_check>
+    <menu_item_check
             name="commit_changes"
             label="Commit">
-        <menu_item_call.on_click 
+        <menu_item_check.on_check
+                function="FlyoutCombo.Button.Check"
+                userdata="commit" />
+        <menu_item_check.on_click
                 function="FlyoutCombo.Button.Action"
                 userdata="commit" />
-    </menu_item_call>
-    <menu_item_call
+    </menu_item_check>
+    <menu_item_check
             name="apply_local"
             label="Apply Only To Myself">
-        <menu_item_call.on_click 
+        <menu_item_check.on_check
+                function="FlyoutCombo.Button.Check"
+                userdata="local" />
+        <menu_item_check.on_click 
                 function="FlyoutCombo.Button.Action"
                 userdata="local" />
-    </menu_item_call>
-    <menu_item_call
+    </menu_item_check>
+    <menu_item_check
             name="apply_parcel"
             label="Apply To Parcel">
-        <menu_item_call.on_click 
+        <menu_item_check.on_check
+                function="FlyoutCombo.Button.Check"
+                userdata="parcel" />
+        <menu_item_check.on_click
                 function="FlyoutCombo.Button.Action"
                 userdata="parcel" />
-    </menu_item_call>
-    <menu_item_call
+    </menu_item_check>
+    <menu_item_check
             name="apply_region"
             label="Apply To Region">
-        <menu_item_call.on_click 
+        <menu_item_check.on_check
+                function="FlyoutCombo.Button.Check"
+                userdata="region" />
+        <menu_item_check.on_click
                 function="FlyoutCombo.Button.Action"
                 userdata="region" />
-    </menu_item_call>
+    </menu_item_check>
 </toggleable_menu>
-- 
cgit v1.2.3


From 2e55eae9cc6ebff303c8f322c71fec9c20e42bd8 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 4 Sep 2018 23:08:20 +0100
Subject: Merge and fix MAINT-9087 and MAINT-9084

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 4b72bbbe0e..0ec3528718 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -171,7 +171,7 @@
                     layout="topleft"
                     left_delta="5"
                     min_val="0"
-                    max_val="2"
+                    max_val="512"
                     name="star_brightness"
                     top_delta="15"
                     width="250"
-- 
cgit v1.2.3


From 32631f09a57548c2bbf7e09211a2053ff2e4e47d Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 4 Sep 2018 23:41:36 +0100
Subject: 8283/4 WIP

---
 .../default/xui/en/panel_settings_sky_density.xml  | 54 ++++++++++++++--------
 1 file changed, 36 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
index 5159a2714e..50663e94f6 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -22,7 +22,7 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="16">
+                height="14">
             <slider
                     decimal_digits="2"
                     follows="left|top"
@@ -35,7 +35,7 @@
                     max_val="1"
                     name="rayleigh_exponential"
                     label="Rayleigh Exponential Term:"
-                    top_pad="8"
+                    top_pad="12"
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
@@ -81,6 +81,20 @@
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="14"
+                    increment="1"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="1000"
+                    max_val="40000"
+                    name="rayleigh_max_altitude"
+                    label="Rayleigh Max Altitude:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
         </layout_panel>
         <layout_panel
                 border="true"
@@ -88,7 +102,7 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="18">
+                height="16">
             <slider
                     decimal_digits="2"
                     follows="left|top"
@@ -101,7 +115,7 @@
                     max_val="3.0"
                     name="mie_exponential"
                     label="Mie Exponential Term:"
-                    top_pad="8"
+                    top_pad="12"
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
@@ -161,6 +175,20 @@
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="14"
+                    increment="1"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="1000"
+                    max_val="30000"
+                    name="mie_max_altitude"
+                    label="Mie Max Altitude:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
         </layout_panel>
         <layout_panel
                 border="true"
@@ -168,7 +196,7 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="16">
+                height="14">
             <slider
                     decimal_digits="2"
                     follows="left|top"
@@ -227,14 +255,6 @@
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
-        </layout_panel>
-        <layout_panel
-                border="true"
-                bevel_style="in"
-                auto_resize="true"
-                user_resize="true"
-                visible="true"
-                height="10">
             <slider
                     decimal_digits="2"
                     follows="left|top"
@@ -242,12 +262,10 @@
                     increment="1"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="1000"
-                    max_val="40000"
-                    name="max_altitude"
-                    label="Max Altitude:"
-                    top_pad="8"
+                    max_val="25000"
+                    name="absorption_max_altitude"
+                    label="Absorption Max Altitude:"
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
-- 
cgit v1.2.3


From 14107dd0625af06dcf2019940eaf8e8d66585658 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 5 Sep 2018 16:43:31 +0300
Subject: MAINT-9083 Add minimize button to floater_fixedenvironment

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index 36462dcd02..73f2683e84 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-        can_minimize="false"
         can_tear_off="false"
         can_resize="false"
         can_drag_on_left="false"
@@ -13,6 +12,7 @@
         save_rect="true"
         title="Fixed Environment"
         save_visibility="false"
+        help_topic="fixed_environment"
         single_instance="true" 
         width="750">
     <layout_stack name="floater_stack"
-- 
cgit v1.2.3


From 451ab80ca65a7ae75316442086f42b6553ea6bbe Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 6 Sep 2018 22:50:26 +0100
Subject: Fix tex format mismatch between what libatmosphere was generating and
 what we were claiming to use in rendering.

First pass at sky shader using libatmosphere sky radiance lookup.

Add atmo density controls to ext daycycle floater tabs.
---
 .../newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml  | 9 +++++++++
 1 file changed, 9 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index c8843db28b..7a5c9cb63f 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -520,6 +520,15 @@ Select a key frame from the timeline above to edit settings.
                                 left_delta="0"
                                 top_pad="5"
                                 name="moon_panel" />
+                        <panel
+                                border="true"
+                                class="panel_settings_density"
+                                filename="panel_settings_sky_density.xml"
+                                label="Density"
+                                layout="topleft"
+                                left_delta="0"
+                                top_pad="5"
+                                name="density_panel" />
                     </tab_container>
                 </layout_panel>        
             </layout_stack>
-- 
cgit v1.2.3


From 4bd2b8b98ba1c562dfd65975a87ef5ee3db35633 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 7 Sep 2018 17:24:29 +0100
Subject: Fix createDensityProfileLayer dropping passed in values.

Enable sky density panel to update advanced atmo precomputed textures.

Take wild stab at appropriate ranges for density parameters in edit panel UI.

Clean up debug-only code that isn't necessary anymore.

Point autobuild at latest version of libatmosphere package.
---
 .../default/xui/en/panel_settings_sky_density.xml  | 73 +++++++++++-----------
 1 file changed, 36 insertions(+), 37 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
index 50663e94f6..e071b30c80 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -24,10 +24,10 @@
                 visible="true"
                 height="14">
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
@@ -40,38 +40,38 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.000001"
                     initial_value="0"
                     layout="topleft"
-                    min_val="-1"
-                    max_val="1"
+                    min_val="-0.01"
+                    max_val="0.01"
                     name="rayleigh_exponential_scale"
                     label="Rayleigh Exponential Scale:"
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="0"
-                    max_val="1"
+                    max_val="0.00001"
                     name="rayleigh_linear"
                     label="Rayleigh Linear Term:"
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="0"
@@ -82,10 +82,9 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="1"
                     follows="left|top"
                     height="14"
-                    increment="1"
                     initial_value="0"
                     layout="topleft"
                     min_val="1000"
@@ -104,10 +103,10 @@
                 visible="true"
                 height="16">
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
@@ -120,42 +119,42 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
-                    min_val="-1"
-                    max_val="1"
+                    min_val="-0.01"
+                    max_val="0.01"
                     name="mie_exponential_scale"
                     label="Mie Exponential Scale:"
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="0"
-                    max_val="3.0"
+                    max_val="0.000004"
                     name="mie_linear"
                     label="Mie Linear Term:"
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="0"
-                    max_val="10"
+                    max_val="1"
                     name="mie_constant"
                     label="Mie Constant Term:"
                     width="400"
@@ -176,10 +175,10 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="1"
                     follows="left|top"
                     height="14"
-                    increment="1"
+                    increment="0.1"
                     initial_value="0"
                     layout="topleft"
                     min_val="1000"
@@ -198,10 +197,10 @@
                 visible="true"
                 height="14">
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
@@ -214,10 +213,10 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="-1"
@@ -228,10 +227,10 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="0"
@@ -242,10 +241,10 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="0"
@@ -256,10 +255,10 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="1"
                     follows="left|top"
                     height="14"
-                    increment="1"
+                    increment="0.1"
                     initial_value="0"
                     layout="topleft"
                     min_val="1000"
-- 
cgit v1.2.3


From 1f69a685eb7d403b8ad5b2ebc24978151da49910 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 7 Sep 2018 22:10:14 +0100
Subject: MAINT-8988

Make rebuilding sky tex not look up invariant values by converting from LLSD 15 times per pixel.

Set range on density multiplier to be non-zero to clamp light attenuation to sane values.

Fix UI for density multiplier to include 4 decimal places and not show 0.0003 as 0.00
---
 indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 7a21d69ed4..fd66df0f74 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -187,14 +187,14 @@
                         Density Multiplier:
                     </text>
                     <slider
-                            decimal_digits="2"
+                            decimal_digits="4"
                             follows="left|top"
                             height="16"
-                            increment="0.01"
+                            increment="0.0001"
                             initial_value="0"
                             layout="topleft"
                             left_delta="5"
-                            min_val="0"
+                            min_val="0.0001"
                             max_val="0.9"
                             name="density_multip"
                             top_delta="20"
@@ -250,4 +250,4 @@
             </layout_stack>                
         </layout_panel>
     </layout_stack>
-</panel>
\ No newline at end of file
+</panel>
-- 
cgit v1.2.3


From 114e358aae80e9e3ca70de093d51e4700c46df37 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 7 Sep 2018 16:09:32 -0700
Subject: Work to make edit floaters respect no mod and no trans.  Importing
 no-trans frame will cause day cycle to become no trans.

---
 .../skins/default/xui/en/floater_fixedenvironment.xml   |  2 ++
 indra/newview/skins/default/xui/en/notifications.xml    | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index 73f2683e84..9b572ce9b0 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -15,6 +15,8 @@
         help_topic="fixed_environment"
         single_instance="true" 
         width="750">
+    <string name="edit_sky">Edit Sky:</string>
+    <string name="edit_water">Edit Water:</string>
     <layout_stack name="floater_stack"
             left="5"
             top="5"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2ab22cb565..cd642f9531 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11197,5 +11197,22 @@ Are you sure you want to continue?
      notext="No"
      yestext="Yes"/>
   </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SettingsMakeNoTrans"
+   type="alertmodal">
+You are about to import non-transferable settings into this daycycle. Continuing will cause the settings you are editing to become non-transferable also. 
+
+This change can not be undone.
+
+Are you sure you want to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Are you sure you want to make settings non-transferable?"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
   
 </notifications>
-- 
cgit v1.2.3


From 43c8f5959f8afaf2f67fbbf49e78965802859b55 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 10 Sep 2018 16:44:56 +0300
Subject: MAINT-9099 Adjustable region altitudes.

---
 .../default/xui/en/panel_region_environment.xml    | 155 ++++++++++++++++++---
 1 file changed, 138 insertions(+), 17 deletions(-)

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

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 557e093f51..8229dcb91d 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -3,20 +3,22 @@
 <panel
         border="true"
         follows="top|left"
-        height="300"
+        height="375"
         label="Environment"
         layout="topleft"
         help_topic="panel_region_environment_tab"
         name="panel_env_info"
-        width="420"> 
+        width="530"> 
     <string name="str_label_use_default">Use Default Settings</string>
     <string name="str_label_use_region">Use Region Settings</string>
     <string name="str_unknow_inventory">Unknown</string>
+    <string name="str_altitude_desription">Sky [INDEX]([ALTITUDE]m)</string>
 
     <layout_stack 
-            width="420"
-            height="450"
-            follows="left|right|top|bottom"
+            width="530"
+            height="367"
+            follows="all"
+            layout="topleft"
             orientation="vertical">
         <layout_panel
                 auto_resize="true"
@@ -34,15 +36,19 @@ settings are disabled.
             </text>
         </layout_panel>
         <layout_panel 
-                auto_resize="true"
+                auto_resize="false"
                 user_resize="false"
+                height="155"
+                min_height="0"
                 name="pnl_environment_config"
                 visible="true">
             <layout_stack 
                     left="5"
-                    top="5"
+                    top="0"
                     right="-5"
-                    follows="left|right|top|bottom"
+                    bottom="-1"
+                    layout="topleft"
+                    follows="all"
                     orientation="horizontal">
                 <layout_panel 
                         background_visible="true"
@@ -51,11 +57,13 @@ settings are disabled.
                         auto_resize="true"
                         user_resize="false"
                         width="260"
-                        min_width="260">
+                        min_width="260"
+                        name="pnl_environment_current">
                     <text follows="top|left"
                             font="SansSerif"
                             halign="left"
-                            text_color="white">Current Environment</text>
+                            text_color="white"
+                            top="2">Current Environment</text>
                     <radio_group
                             height="90"
                             layout="topleft"
@@ -117,12 +125,16 @@ settings are disabled.
                         bevel_style="in"
                         auto_resize="true"
                         user_resize="false"
-                        background_visible="true">
+                        width="260"
+                        min_width="260"
+                        background_visible="true"
+                        name="pnl_environment_length">
                     <text 
                             font="SansSerif"
                             follows="top|left|right"
                             halign="left"
-                            text_color="white">Day Settings</text>
+                            text_color="white"
+                            top="2">Day Settings</text>
                     <text
                             type="string"
                             length="1"
@@ -180,7 +192,7 @@ settings are disabled.
                             height="12"
                             layout="topleft"
                             left_delta="0"
-                            top_pad="20"
+                            top_pad="10"
                             width="200">
                         Apparent Time of Day:
                     </text>
@@ -200,25 +212,134 @@ settings are disabled.
                 </layout_panel>
             </layout_stack>
         </layout_panel>
-        <layout_panel 
+        <layout_panel
+                auto_resize="false"
+                user_resize="false"
+                height="155"
+                min_height="0"
+                name="pnl_environment_altitudes"
+                visible="true">
+            <panel
+                left="5"
+                top="0"
+                bottom="-1"
+                width="260"
+                follows="left|top|bottom"
+                background_visible="true"
+                border="true"
+                bevel_style="in"
+                name="cnt_panel">
+                <text follows="top|left"
+                    font="SansSerif"
+                    halign="left"
+                    text_color="white"
+                    top="2">Sky Altitudes</text>
+                <multi_slider
+                    decimal_digits="0"
+                    follows="bottom"
+                    height="120"
+                    width="10"
+                    orientation="vertical"
+                    increment="10"
+                    initial_value="100"
+                    max_val="4000"
+                    layout="topleft"
+                    left="15"
+                    top="20"
+                    max_sliders="20"
+                    name="sld_altitudes"
+                    show_text="false">
+                    <slider name="sld1" value="200"/>
+                    <slider name="sld2" value="400"/>
+                    <slider name="sld3" value="600"/>
+                </multi_slider>
+                <icon
+                    follows="left|top"
+                    height="10"
+                    width="10"
+                    image_name="Rounded_Square"
+                    layout="topleft"
+                    name="camera_icon"
+                    mouse_opaque="false"
+                    visible="true"
+                    left_delta="0"
+                    top_pad="-3"/>
+                <text
+                        type="string"
+                        length="1"
+                        follows="left|top"
+                        height="12"
+                        layout="topleft"
+                        left_pad="3"
+                        top_delta="0"
+                        width="200"
+                        name="ground">
+                    Ground
+                </text>
+                <text
+                        type="string"
+                        length="1"
+                        follows="left"
+                        height="12"
+                        layout="topleft"
+                        left="25"
+                        top="30"
+                        width="200"
+                        name="alt1">
+                    Sky [INDEX]([ALTITUDE]m)
+                </text>
+                <text
+                        type="string"
+                        length="1"
+                        follows="left|top"
+                        height="12"
+                        layout="topleft"
+                        left="25"
+                        top="40"
+                        width="200"
+                        name="alt2">
+                    Sky [INDEX]([ALTITUDE]m)
+                </text>
+                <text
+                        type="string"
+                        length="1"
+                        follows="left|top"
+                        height="12"
+                        layout="topleft"
+                        left="25"
+                        top="50"
+                        width="200"
+                        name="alt3">
+                    Sky [INDEX]([ALTITUDE]m)
+                </text>
+            </panel>
+        </layout_panel>
+        <layout_panel
                 auto_resize="true"
                 user_resize="false"
-                height="21"
+                height="0"
                 min_height="0"
+                name="pnl_auto_adjust"
+                visible="true"/>
+        <layout_panel
+                auto_resize="false"
+                user_resize="false"
+                height="59"
+                min_height="59"
                 name="pnl_environment_buttons">
             <check_box
                     height="20"
                     label="Parcel Owners May Override Environment"
                     layout="topleft"
                     left="10"
-                    top="10"
+                    top="0"
                     name="chk_allow_override"
                     width="200" />
             <button
                     follows="top|left"
                     height="23"
                     label="Apply"
-                    top_pad="10"
+                    top_pad="5"
                     name="btn_apply"
                     width="100" />
             <button
-- 
cgit v1.2.3


From e075c65ee22a54b114808057399b5c7546dfb08a Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 10 Sep 2018 16:43:49 +0100
Subject: First pass at preferences and feature table hookup for advanced
 atmospherics.

---
 .../xui/en/floater_preferences_graphics_advanced.xml       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index c2500951a6..d9bbf32583 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -819,6 +819,20 @@
       function="Pref.VertexShaderEnable" />
   </check_box>
 
+  <check_box
+    control_name="RenderUseAdvancedAtmospherics"
+    height="16"
+    initial_value="true"
+    label="Advanced Atmospherics"
+    layout="topleft"
+    left="480"
+    name="UseAdvancedAtmo"
+    top_delta="16"
+    width="240">
+    <check_box.commit_callback
+      function="Pref.AdvancedAtmosphericsEnable" />
+  </check_box>
+
   <text
     type="string"
     length="1"
-- 
cgit v1.2.3


From 642a4ddd60745db292c543a5cea3b1e5fe606795 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 10 Sep 2018 20:39:48 +0100
Subject: Fixes for switching between atmospherics implementations on the fly.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 7a5c9cb63f..aec71fda07 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -520,6 +520,7 @@ Select a key frame from the timeline above to edit settings.
                                 left_delta="0"
                                 top_pad="5"
                                 name="moon_panel" />
+                        <!-- added programatically so it doesn't show up whether we want it or not
                         <panel
                                 border="true"
                                 class="panel_settings_density"
@@ -529,6 +530,7 @@ Select a key frame from the timeline above to edit settings.
                                 left_delta="0"
                                 top_pad="5"
                                 name="density_panel" />
+                         -->
                     </tab_container>
                 </layout_panel>        
             </layout_stack>
-- 
cgit v1.2.3


From cd2dc42a28873f9d3d18c4d52d1b1a64a2170a6f Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 11 Sep 2018 17:49:26 +0100
Subject: Hide UI related to advanced atmospherics and make it off by default
 again.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index d9bbf32583..4b202ec21e 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -819,6 +819,7 @@
       function="Pref.VertexShaderEnable" />
   </check_box>
 
+  <!--
   <check_box
     control_name="RenderUseAdvancedAtmospherics"
     height="16"
@@ -832,6 +833,7 @@
     <check_box.commit_callback
       function="Pref.AdvancedAtmosphericsEnable" />
   </check_box>
+  -->
 
   <text
     type="string"
-- 
cgit v1.2.3


From 27a76a7e731bd13fb5d0862a932f40ea5c9c7119 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 12 Sep 2018 17:05:27 -0700
Subject: SL-1402, SL-1193, SL-976: Corrected strings and layout for named bugs
 ("Use Shared Environment", no selection format in panel, Missing String in
 give object) Also Rider learned how to spell Committed

---
 indra/newview/skins/default/xui/en/menu_viewer.xml              | 4 ++--
 indra/newview/skins/default/xui/en/panel_region_environment.xml | 6 ++----
 indra/newview/skins/default/xui/en/strings.xml                  | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b6bc271cf1..8af754ffec 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -698,8 +698,8 @@
                  parameter="midnight" />
             </menu_item_check>
             <menu_item_check
-             label="Use Region Settings"
-             name="Use Region Settings">
+             label="Use Shared Environment"
+             name="Use Shared Environment">
                 <menu_item_check.on_click
                  function="World.EnvSettings"
                  parameter="region" />
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 8229dcb91d..a58f38d417 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -26,13 +26,11 @@
                 name="pnl_environment_disabled"
                 visible="false">
             <text follows="top|left|bottom|right"
-                            font="SansSerif"
                             halign="center"
                             valign="top"
-                            top_pad="20"
+                            top_pad="40"
                             text_color="white">
-No Parcel parcel is selected. Environmental 
-settings are disabled.
+No parcel is selected. Environmental settings are disabled.
             </text>
         </layout_panel>
         <layout_panel 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3a882a73d3..76d040150d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -404,9 +404,9 @@ http://secondlife.com/support for help fixing this problem.
 	<string name="simstate">simstate</string>
 	<string name="favorite">favorite</string>
 	<string name="symbolic link">link</string>
-	<string name="symbolic folder link">folder link</string>
-  <string name="mesh">mesh</string>
-  <string name="settings">settings</string>
+    <string name="settings blob">settings</string>
+    <string name="symbolic folder link">folder link</string>
+    <string name="mesh">mesh</string>
   
 	<!-- llvoavatar. Displayed in the avatar chat bubble -->
 	<string name="AvatarEditingAppearance">(Editing Appearance)</string>
-- 
cgit v1.2.3


From c5936bbba031272b1deb78ce8ea52663d033695b Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 12 Sep 2018 21:02:58 +0300
Subject: SL-1961 Icon support for multislider and icons on altitudes slider

---
 .../default/xui/en/panel_region_environment.xml    | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

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

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 a58f38d417..3b77744f1b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -235,8 +235,8 @@ No parcel is selected. Environmental settings are disabled.
                 <multi_slider
                     decimal_digits="0"
                     follows="bottom"
-                    height="120"
-                    width="10"
+                    height="123"
+                    width="17"
                     orientation="vertical"
                     increment="10"
                     initial_value="100"
@@ -246,22 +246,25 @@ No parcel is selected. Environmental settings are disabled.
                     top="20"
                     max_sliders="20"
                     name="sld_altitudes"
-                    show_text="false">
+                    show_text="false"
+                    thumb_image="Inv_SettingsSky"
+                    thumb_width="17"
+                    thumb_highlight_color="white">
                     <slider name="sld1" value="200"/>
                     <slider name="sld2" value="400"/>
                     <slider name="sld3" value="600"/>
                 </multi_slider>
                 <icon
                     follows="left|top"
-                    height="10"
-                    width="10"
-                    image_name="Rounded_Square"
+                    height="17"
+                    width="17"
+                    image_name="Inv_SettingsSky"
                     layout="topleft"
-                    name="camera_icon"
+                    name="icon_ground"
                     mouse_opaque="false"
                     visible="true"
                     left_delta="0"
-                    top_pad="-3"/>
+                    top_pad="-9"/>
                 <text
                         type="string"
                         length="1"
@@ -280,7 +283,7 @@ No parcel is selected. Environmental settings are disabled.
                         follows="left"
                         height="12"
                         layout="topleft"
-                        left="25"
+                        left="35"
                         top="30"
                         width="200"
                         name="alt1">
@@ -292,7 +295,7 @@ No parcel is selected. Environmental settings are disabled.
                         follows="left|top"
                         height="12"
                         layout="topleft"
-                        left="25"
+                        left="35"
                         top="40"
                         width="200"
                         name="alt2">
@@ -304,7 +307,7 @@ No parcel is selected. Environmental settings are disabled.
                         follows="left|top"
                         height="12"
                         layout="topleft"
-                        left="25"
+                        left="35"
                         top="50"
                         width="200"
                         name="alt3">
-- 
cgit v1.2.3


From a2bd8673d71f052211e3e3cc95c7fa5257d2a4b1 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 14 Sep 2018 16:03:05 +0300
Subject: SL-9652 FIXED EEP Not allowed characters can be used for Environment
 Assets name

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index aec71fda07..0c4d342297 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -55,6 +55,7 @@
                     left_pad="10"
                     max_length_bytes="100"
                     name="day_cycle_name"
+                    prevalidate_callback="ascii"
                     top="5"
                     width="200"
                     height="21" />
diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index 9b572ce9b0..7cf7e8bb32 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -43,6 +43,7 @@
                     left_delta="45"
                     width="250"
                     name="settings_name"
+                    prevalidate_callback="ascii"
                     max_length_chars="32"
                     height="20"/>
             <button
-- 
cgit v1.2.3


From 7c6ac0740dac946275ef3f904614688f4b73f850 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 14 Sep 2018 09:52:28 -0700
Subject: SL-1556: Correctly identify when the selected parcel is in another
 region and display a message about cross region environments.

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

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

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 3b77744f1b..3ce0d7a2ef 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -13,7 +13,9 @@
     <string name="str_label_use_region">Use Region Settings</string>
     <string name="str_unknow_inventory">Unknown</string>
     <string name="str_altitude_desription">Sky [INDEX]([ALTITUDE]m)</string>
-
+    <string name="str_no_parcel">No parcel is selected. Environmental settings are disabled.</string>
+    <string name="str_cross_region">Environmental settings are not available across region boundries.</string>
+    <string name="str_legacy">Environmental settings are not available on this region.</string>
     <layout_stack 
             width="530"
             height="367"
@@ -29,8 +31,9 @@
                             halign="center"
                             valign="top"
                             top_pad="40"
+                            name="txt_environment_disabled"
                             text_color="white">
-No parcel is selected. Environmental settings are disabled.
+            ...
             </text>
         </layout_panel>
         <layout_panel 
-- 
cgit v1.2.3


From 59a92c8523b976512543a6d2611ff8b5da39790c Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 17 Sep 2018 16:51:45 +0300
Subject: SL-9650 EEP environment panel should not animate

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

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

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 3ce0d7a2ef..cfb142093a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -21,6 +21,7 @@
             height="367"
             follows="all"
             layout="topleft"
+            animate="false"
             orientation="vertical">
         <layout_panel
                 auto_resize="true"
@@ -50,6 +51,7 @@
                     bottom="-1"
                     layout="topleft"
                     follows="all"
+                    animate="false"
                     orientation="horizontal">
                 <layout_panel 
                         background_visible="true"
-- 
cgit v1.2.3


From 9581a197aceba7647ab9153513089570f11c4f9a Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 17 Sep 2018 19:48:58 +0100
Subject: SL-1873

Make range of star brightness in code and in UI 0-500 (not 512).
---
 indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 0ec3528718..841a8c3199 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -171,7 +171,7 @@
                     layout="topleft"
                     left_delta="5"
                     min_val="0"
-                    max_val="512"
+                    max_val="500"
                     name="star_brightness"
                     top_delta="15"
                     width="250"
-- 
cgit v1.2.3


From 5c997d5ebc7b5d0a73b313da302d9ca0f5f6c65a Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 20 Sep 2018 17:42:33 +0300
Subject: SL-9662 [EEP] Slightly shift environment label positions

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

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

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 cfb142093a..539d5a636b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -70,7 +70,7 @@
                     <radio_group
                             height="90"
                             layout="topleft"
-                            top_pad="5"
+                            top_pad="8"
                             left_delta="10"
                             name="rdg_environment_select">
                         <radio_item
@@ -145,7 +145,7 @@
                             height="12"
                             layout="topleft"
                             left_delta="10"
-                            top_pad="10"
+                            top_pad="14"
                             width="200">
                         Day Length (hours)
                     </text>
-- 
cgit v1.2.3


From 6c9e4e3cf0f7c594034025499654b920d546671a Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 21 Sep 2018 14:38:32 +0300
Subject: SL-9715 [EEP] Allow setting default creation permissions for
 environment settings

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml
index 1c3af49bfe..49dc719a24 100644
--- a/indra/newview/skins/default/xui/en/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml
@@ -488,6 +488,67 @@
        left_pad="0"
        top_delta="0"
        width="100" />
+      <text
+       name="label_13"
+       type="string"
+       length="1"
+       follows="left|top"
+       height="16"
+       layout="topleft"
+       left="0"
+       tool_tip="Set default permissions for when Environment settings are created"
+       width="100">
+          Settings
+      </text>
+      <icon
+       follows="left|top"
+       height="16"
+       image_name="Inv_Settings"
+       layout="topleft"
+       left_pad="2"
+       width="18"/>
+      <check_box
+       height="16"
+       layout="topleft"
+       name="env_settings_c"
+       left_pad="45"
+       top_delta="0"
+       value="true"
+       enabled="false"
+       width="100">
+      </check_box>
+      <check_box
+       control_name="SettingsNextOwnerModify"
+       height="16"
+       layout="topleft"
+       name="env_settings_m"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       control_name="SettingsNextOwnerTransfer"
+       height="16"
+       layout="topleft"
+       name="env_settings_t"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       enabled="false"
+       height="16"
+       layout="topleft"
+       name="env_settings_s"
+       left_pad="0"
+       top_delta="0"
+       width="120" />
+      <check_box
+       enabled="false"
+       height="16"
+       layout="topleft"
+       name="env_settings_e"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
   </panel>
   <button
    height="20"
-- 
cgit v1.2.3


From 339a5449fc89700ee22c53ecd60adbed6faba1a5 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 21 Sep 2018 18:24:12 +0300
Subject: SL-9714 [EEP] Allow changing permissions of environment settings
 using the bulk perms floater

---
 indra/newview/skins/default/xui/en/floater_bulk_perms.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index e7ab3cacdc..b4577f54e6 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -156,7 +156,20 @@
      name="icon_texture"
      tool_tip="Textures"
      left_pad="2" />
-
+  <check_box
+    control_name="BulkChangeIncludeSettings"
+    height="16"
+    name="check_settings"
+    left="245"
+    top="25"
+    width="16" />
+  <icon
+    height="16"
+    image_name="Inv_Settings"
+    mouse_opaque="true"
+    name="icon_setting"
+    tool_tip="Environment settings"
+    left_pad="2" />
     <button
       height="23"
     layout="topleft"
-- 
cgit v1.2.3


From 92dc9ceb834dd31aa6fe1c67b9ea896a62cd7c7c Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 24 Sep 2018 16:36:01 +0300
Subject: SL-9676 EEP Pick:SELECT SETTINGS limit folder operations options

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 2df52ec6d5..2258a1dc24 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -51,6 +51,7 @@
                     right="-2" />
             <inventory_panel
                     allow_multi_select="false"
+                    suppress_folder_menu="true"
                     bg_visible="true"
                     bg_alpha_color="DkGray2"
                     border="false"
-- 
cgit v1.2.3


From f0eb06ed13313e3c5a78224506cde7a894591880 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 24 Sep 2018 18:24:32 +0300
Subject: SL-1546 VitrualTrackBall - Reduced the angle change per button click
 to 1deg

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

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

diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
index 0e729c821a..9fa77855c0 100644
--- a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
+++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
@@ -5,7 +5,7 @@
     height="150"
     user_resize="false"     
     increment_angle_mouse="1.5f"
-    increment_angle_btn="3.0f"    
+    increment_angle_btn="1.0f"    
     image_sphere="VirtualTrackball_Sphere"
     image_moon_back="VirtualTrackball_Moon_Back"
     image_moon_front="VirtualTrackball_Moon_Front"
-- 
cgit v1.2.3


From 6e0481b6040a0f9cad9d91f130e5ddd9ab1a0b52 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 24 Sep 2018 18:54:54 +0300
Subject: SL-9677 EEP Small adjustment to error message for not applying
 enviroment setting

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index cd642f9531..4813ae3468 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6068,7 +6068,7 @@ This day cycle file references a missing sky file: [SKY].
    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]
+Sorry, the settings couldn't be applied to the region. Reason: [FAIL_REASON]
   </notification>
 
   <notification
-- 
cgit v1.2.3


From ed2e333a544acc467df0f1d97b4fc5d2fd72b3b2 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 24 Sep 2018 17:00:01 -0700
Subject: MAINT-9734: Change limits on settings values.

---
 .../default/xui/en/panel_settings_sky_atmos.xml    | 12 +++++------
 .../default/xui/en/panel_settings_sky_clouds.xml   | 14 ++++++-------
 .../default/xui/en/panel_settings_sky_sunmoon.xml  |  8 ++++----
 .../skins/default/xui/en/panel_settings_water.xml  | 24 ++++++++++++++--------
 4 files changed, 32 insertions(+), 26 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index fd66df0f74..8ef96009d4 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -119,7 +119,7 @@
                             layout="topleft"
                             left_delta="5"
                             min_val="0"
-                            max_val="1"
+                            max_val="5"
                             name="haze_horizon"
                             top_delta="20"
                             width="207"
@@ -142,7 +142,7 @@
                             layout="topleft"
                             left_delta="5"
                             min_val="0"
-                            max_val="1"
+                            max_val="5"
                             name="haze_density"
                             top_delta="20"
                             width="207"
@@ -164,7 +164,7 @@
                             initial_value="0"
                             layout="topleft"
                             left_delta="5"
-                            max_val="10"
+                            max_val="20"
                             name="scene_gamma"
                             top_delta="20"
                             width="214"
@@ -195,7 +195,7 @@
                             layout="topleft"
                             left_delta="5"
                             min_val="0.0001"
-                            max_val="0.9"
+                            max_val="2"
                             name="density_multip"
                             top_delta="20"
                             width="207"
@@ -218,7 +218,7 @@
                             layout="topleft"
                             left_delta="5"
                             min_val="0"
-                            max_val="100"
+                            max_val="1000"
                             name="distance_multip"
                             top_delta="20"
                             width="219"
@@ -241,7 +241,7 @@
                             layout="topleft"
                             left_delta="5"
                             min_val="0"
-                            max_val="4000"
+                            max_val="10000"
                             name="max_alt"
                             top_delta="20"
                             width="219"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 412ed8bf82..568345e01f 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -83,7 +83,7 @@
                     layout="topleft"
                     left_delta="5"
                     min_val="0"
-                    max_val="1"
+                    max_val="3"
                     name="cloud_scale"
                     top_delta="20"
                     width="214"
@@ -105,10 +105,10 @@
                     visible="true"
                     left_delta="0"
                     top_delta="21"
-                    min_val_x="-10"
-                    max_val_x="10"
-                    min_val_y="-10"
-                    max_val_y="10" />
+                    min_val_x="-30"
+                    max_val_x="30"
+                    min_val_y="-30"
+                    max_val_y="30" />
 
             <text
                     follows="left|top"
@@ -183,7 +183,7 @@
                     layout="topleft"
                     left_delta="0"
                     min_val="0"
-                    max_val="1"
+                    max_val="3"
                     name="cloud_density_d"
                     top_delta="20"
                     width="200"
@@ -237,7 +237,7 @@
                     layout="topleft"
                     left_delta="0"
                     min_val="0"
-                    max_val="1"
+                    max_val="2"
                     name="cloud_detail_d"
                     top_delta="20"
                     width="200"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 841a8c3199..bc267bb7b9 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -124,8 +124,8 @@
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
-                    min_val="0"
-                    max_val="0.5"
+                    min_val="-2"
+                    max_val="2"
                     name="glow_focus"
                     top_delta="15"
                     width="250"
@@ -147,8 +147,8 @@
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
-                    min_val="1"
-                    max_val="1.99"
+                    min_val="0"
+                    max_val="2"
                     name="glow_size"
                     top_delta="15"
                     width="250"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 4c9ae57941..d88195bf48 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -68,6 +68,7 @@
                     initial_value="0"
                     layout="top"
                     left_delta="15"
+                    min_val="-10"
                     max_val="10"
                     name="water_fog_density"
                     top_delta="5"
@@ -190,11 +191,11 @@
                         visible="true"
                         left_delta="0"
                         top_delta="21"
-                        min_val_x="-4"
-                        max_val_x="4"
+                        min_val_x="-20"
+                        max_val_x="20"
                         increment_x="0.5f"
-                        min_val_y="-4"
-                        max_val_y="4"
+                        min_val_y="-20"
+                        max_val_y="20"
                         increment_y="0.5f"
                         arrow_color="white"/>
                     
@@ -214,10 +215,10 @@
                         visible="true"
                         left_delta="0"
                         top_delta="21"
-                        min_val_x="-4"
-                        max_val_x="4"
-                        min_val_y="-4"
-                        max_val_y="4" 
+                        min_val_x="-20"
+                        max_val_x="20"
+                        min_val_y="-20"
+                        max_val_y="20" 
                         arrow_color="white"/>
 
                     <text
@@ -306,6 +307,8 @@
                             height="16"
                             layout="topleft"
                             left_delta="5"
+                            min_val="0"
+                            max_val="3"
                             name="water_scale_above"
                             top_pad="5"
                             width="200"
@@ -330,6 +333,8 @@
                             initial_value="0"
                             layout="topleft"
                             left_delta="5"
+                            min_val="0"
+                            max_val="3"
                             name="water_scale_below"
                             top_pad="5"
                             width="200"
@@ -352,7 +357,8 @@
                             initial_value="0"
                             layout="topleft"
                             left_delta="5"
-                            max_val="0.16"
+                            min_val="-0.5"
+                            max_val="0.5"
                             name="water_blur_multip"
                             top_pad="5"
                             width="200"
-- 
cgit v1.2.3


From 18dd6f076e3d3936e6b5a426d8c5476fac4c4e58 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 25 Sep 2018 20:27:59 +0300
Subject: SL-1961 EEP Altitude labels auto-adjustment

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

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

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 539d5a636b..856559cec8 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -244,7 +244,7 @@
                     width="17"
                     orientation="vertical"
                     increment="10"
-                    initial_value="100"
+                    min_val="100"
                     max_val="4000"
                     layout="topleft"
                     left="15"
@@ -277,7 +277,7 @@
                         height="12"
                         layout="topleft"
                         left_pad="3"
-                        top_delta="0"
+                        top_delta="2"
                         width="200"
                         name="ground">
                     Ground
-- 
cgit v1.2.3


From 2a1a7396b22246ae526731d02a8548990187fe1b Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 25 Sep 2018 15:12:46 -0700
Subject: Fix slider max to 168

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

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

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 856559cec8..cfbe25129b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -161,7 +161,7 @@
                             top_pad="6"
                             name="sld_day_length"
                             min_val="4"
-                            max_val="178"
+                            max_val="168"
                             width="180" />
                     <text
                             type="string"
-- 
cgit v1.2.3


From 405f5c879c44f32635dcb94de2c7dfb9e4a8673a Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 26 Sep 2018 17:39:55 +0300
Subject: SL-9732 FIXED [EEP] Save As does not provide dialogue to supply new
 setting name

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4813ae3468..d0dafdbc8d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11154,6 +11154,30 @@ Unable to apply those settings to the environment.
 This Region does not support environmental settings.
   <tag>fail</tag>
   </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
+   label="Save Outfit"
+   name="SaveSettingAs"
+   type="alertmodal">
+    <unique/>
+    Save current environmental settings as:
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" type="text">
+        [DESC] (new)
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
 
   <notification
    icon="notify.tga"
-- 
cgit v1.2.3


From a309d30554fbc14f8ee3dfa84fdc8c94709efa82 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 27 Sep 2018 20:38:12 +0300
Subject: =?UTF-8?q?SL-9752=20The=20=E2=80=99Show=20Empty=20Folders?=
 =?UTF-8?q?=E2=80=99=20option=20is=20displayed=20over=20the=20lower=20scro?=
 =?UTF-8?q?ll=20bar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/xui/en/floater_my_environments.xml     | 36 ++++++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index 83416f60d7..5565cdcaf0 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -88,17 +88,34 @@
                 name="list_panel"
                 label="Environments"
                 font="SansSerifBold">
-            <inventory_panel
-                    allow_multi_select="false"
-                    bg_visible="true"
-                    bg_alpha_color="DkGray2"
-                    border="true"
-                    follows="left|top|right|bottom"
+            <panel
+                    name="pnl_inv_wrap"
+                    label="pnl_inv_wrap"
+                    follows="all"
+                    layout="topleft"
                     left="2"
-                    name="pnl_settings"
                     top="2"
                     right="-2"
-                    bottom="-36" /> 
+                    bottom="-2"
+                    background_visible="true"
+                    bg_alpha_color="DkGray2"
+                    border="true">
+                <inventory_panel
+                       left="0"
+                       top="0"
+                       right="-1"
+                       bottom="-1"
+                       allow_multi_select="false"
+                       follows="all"
+                       layout="topleft"
+                       name="pnl_settings"/>
+            </panel>
+        </layout_panel>
+        <layout_panel
+                auto_resize="false"
+                user_resize="false"
+                tab_group="1"
+                height="14">
             <check_box
                     follows="left|bottom"
                     height="14"
@@ -106,8 +123,7 @@
                     label="Show Empty Folders"
                     layout="topleft"
                     name="chk_showfolders"
-                    top="-20"
-                    top_pad="0"
+                    top="0"
                     left_delta="-3"
                     width="200" />
         </layout_panel>
-- 
cgit v1.2.3


From 171cb519576139ccfda801f5c7b5c62ea4dde23f Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 28 Sep 2018 15:24:13 +0300
Subject: SL-9762 Fixed EEP Several Day Cycle UI bits are movable

---
 .../skins/default/xui/en/floater_edit_ext_day_cycle.xml    | 14 +++++++-------
 .../skins/default/xui/en/floater_fixedenvironment.xml      |  2 +-
 .../skins/default/xui/en/panel_settings_sky_atmos.xml      |  6 +++---
 .../skins/default/xui/en/panel_settings_sky_clouds.xml     |  4 ++--
 .../skins/default/xui/en/panel_settings_sky_density.xml    |  6 +++---
 .../skins/default/xui/en/panel_settings_sky_sunmoon.xml    |  6 +++---
 .../newview/skins/default/xui/en/panel_settings_water.xml  |  6 +++---
 7 files changed, 22 insertions(+), 22 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 0c4d342297..e1c08a24f2 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -33,7 +33,7 @@
         <layout_panel name="name_and_import"
                 border="false"
                 auto_resize="false"
-                user_resize="true"
+                user_resize="false"
                 height="29"
                 min_height="29"
                 background_visible="false">
@@ -73,7 +73,7 @@
         <layout_panel name="content"
                 border="false"
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 background_visible="false">
             <layout_stack name="content_stack"
                     width="705"
@@ -85,7 +85,7 @@
                         border="false"
                         bevel_style="in"
                         auto_resize="false"
-                        user_resize="true"
+                        user_resize="false"
                         height="150"
                         min_height="0"
                         visible="true">
@@ -424,7 +424,7 @@
                 </layout_panel>
                 <layout_panel name="frame_edit_controls"
                         auto_resize="false"
-                        user_resize="true"
+                        user_resize="false"
                         height="30"
                         width="700"
                         min_height="30"
@@ -446,7 +446,7 @@ Select a key frame from the timeline above to edit settings.
                 </layout_panel>
                 <layout_panel name="frame_settings_water"
                         auto_resize="true"
-                        user_resize="true"
+                        user_resize="false"
                         height="420"
                         width="700"
                         min_height="0"
@@ -476,7 +476,7 @@ Select a key frame from the timeline above to edit settings.
                 </layout_panel>
                 <layout_panel name="frame_settings_sky"
                         auto_resize="true"
-                        user_resize="true"
+                        user_resize="false"
                         height="420"
                         width="700"
                         min_height="0"
@@ -538,7 +538,7 @@ Select a key frame from the timeline above to edit settings.
         </layout_panel>
         <layout_panel name="buttons"
                 auto_resize="false"
-                user_resize="true"
+                user_resize="false"
                 height="26"
                 min_height="26"
                 visible="true"
diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index 7cf7e8bb32..348c0ce195 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -69,7 +69,7 @@
         </layout_panel>
         <layout_panel name="tab_area"
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 height="11"
                 min_height="0"
                 visible="true">
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 8ef96009d4..18c2ac0db9 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -85,7 +85,7 @@
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 visible="true">
             <layout_stack name="atmosphere1"
                     left="5"
@@ -98,7 +98,7 @@
                         border="false"
                         bevel_style="in"
                         auto_resize="true"
-                        user_resize="true"
+                        user_resize="false"
                         visible="true"
                         min_width="225">
                     <text
@@ -174,7 +174,7 @@
                         border="false"
                         bevel_style="in"
                         auto_resize="true"
-                        user_resize="true"
+                        user_resize="false"
                         visible="true"
                         min_width="225">
                     <text
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 568345e01f..886e3c1e04 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -20,7 +20,7 @@
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 visible="true"
                 height="75">
             <text
@@ -131,7 +131,7 @@
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 visible="true"
                 height="75">
             <text
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
index e071b30c80..e9aa07957e 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -20,7 +20,7 @@
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 visible="true"
                 height="14">
             <slider
@@ -99,7 +99,7 @@
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 visible="true"
                 height="16">
             <slider
@@ -193,7 +193,7 @@
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 visible="true"
                 height="14">
             <slider
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index bc267bb7b9..fd9933f69f 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -19,7 +19,7 @@
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 visible="true"
                 height="350">
             <text
@@ -181,7 +181,7 @@
                 border="false"
                 bevel_style="in"
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 visible="true"
                 height="350">
             <layout_stack 
@@ -195,7 +195,7 @@
                         border="true"
                         bevel_style="in"
                         auto_resize="true"
-                        user_resize="true"
+                        user_resize="false"
                         visible="true"
                         height="220">
                     <text
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index d88195bf48..eead03d185 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -141,7 +141,7 @@
         </layout_panel>
         <layout_panel
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 visible="true">
             <layout_stack name="water_stack2"
                     left="5"
@@ -154,7 +154,7 @@
                         border="true"
                         bevel_style="in"
                         auto_resize="true"
-                        user_resize="true"
+                        user_resize="false"
                         visible="true"
                         min_width="460"
                         width="50">
@@ -276,7 +276,7 @@
                         border="true"
                         bevel_style="in"
                         auto_resize="true"
-                        user_resize="true"
+                        user_resize="false"
                         width="50"
                         visible="true">
                     <text
-- 
cgit v1.2.3


From 50ec228b02026a4ddc3e108df6a8d7709c713d53 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 1 Oct 2018 16:45:19 +0300
Subject: SL-9660 EEP Remove residual code (LLFloaterEditDayCycle and
 LLEnvironment::UserPrefs)

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

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

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
deleted file mode 100644
index d9a3ad0c4b..0000000000
--- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
+++ /dev/null
@@ -1,485 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="381"
- layout="topleft"
- name="Edit Day cycle"
- help_topic="day_presets"
- save_rect="true"
- title="Edit Day Cycle"
- width="705">
-
-    <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>
-    <string name="combo_label">-Select a preset-</string>
-
-    <text
-     follows="top|left|right"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="hint"
-     top="25"
-     width="685" />
-    <text
-     follows="top|left|right"
-     font="SansSerif"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="label"
-     top_pad="25"
-     width="120">
-     Preset Name:
-    </text>
-    <combo_box
-     allow_text_entry="true"
-     follows="top|left"
-     layout="topleft"
-     left_pad="10"
-     max_chars="100"
-     name="day_cycle_combo"
-     top_delta="-5"
-     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="95"
-     layout="topleft"
-     left_pad="10"
-     name="note"
-     top_delta="0"
-     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 ========-->
-    <text
-     follows="left|top|right"
-     height="10"
-     layout="topleft"
-     left="10"    
-     name="hint_item1"
-     top="100"
-     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="hint_item2"
-     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="hint_item3"
-     top_pad="10"
-     width="300">
-     - Use the scrubber to preview your day cycle.
-    </text>
-    <panel
-     follows="top|left"
-     height="100"
-     name="day_cycle_slider_panel"
-     layout="topleft"
-     left_delta="25"
-     top_pad="15"
-     width="660">
-        <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="WLCurKeyPresetText"
-     top_pad="10"
-     width="80">
-        Sky Setting:
-    </text>
-    <combo_box
-     height="18"
-     label="Preset"
-     layout="topleft"
-     left_pad="5"
-     name="WLSkyPresets"
-     width="205" />
-        <text
-     type="string"
-     length="1"
-     border_visible="true"
-     follows="left|top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left_delta="-40"
-     name="WLCurKeyTimeText"
-     top_pad="15"
-     width="35">
-        Time:
-    </text>
-    <time
-     follows="left|top"
-     height="16"
-     label_width="0"
-     layout="topleft"
-     left_pad="3"
-     name="time"
-     top_delta="-1"
-     value="6:00 AM"
-     width="75"/> 
-    <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 13126a27f1acc482f3f05e2c4f2a41df8b3bc69a Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 2 Oct 2018 14:17:27 +0300
Subject: SL-9733 Perfomance trweak. Should be incompatible with normal filters
 but far faster.

---
 indra/newview/skins/default/xui/en/floater_my_environments.xml | 5 +++--
 indra/newview/skins/default/xui/en/floater_settings_picker.xml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index a11a2c1200..4384c01033 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -102,7 +102,7 @@
                     background_visible="true"
                     bg_alpha_color="DkGray2"
                     border="true">
-                <inventory_panel
+                <asset_filtered_inv_panel
                        left="0"
                        top="0"
                        right="-1"
@@ -110,7 +110,8 @@
                        allow_multi_select="false"
                        follows="all"
                        layout="topleft"
-                       name="pnl_settings"/>
+                       name="pnl_settings"
+                       filter_asset_type="settings"/>
             </panel>
         </layout_panel>
         <layout_panel
diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 2862d1ae37..7cc2c517ca 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -57,7 +57,7 @@
               bottom="-2"
               background_visible="true"
               bg_alpha_color="DkGray2">
-                <inventory_panel
+                <asset_filtered_inv_panel
                     allow_multi_select="false"
                     suppress_folder_menu="true"
                     bg_visible="true"
@@ -68,7 +68,8 @@
                     name="pnl_inventory"
                     top="1"
                     right="-4"
-                    bottom="-1" />
+                    bottom="-1"
+                    filter_asset_type="settings" />
             </panel>
         </layout_panel>
         <layout_panel name="temp"
-- 
cgit v1.2.3


From 06e83caa26db3a0d9682af394f4e55eeaacf1e09 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 2 Oct 2018 15:36:55 +0300
Subject: SL-9778 EEP It's possible to open more then one My Environments
 floater

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index 5565cdcaf0..dd05dd5a20 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -2,6 +2,8 @@
 <floater
         positioning="cascading"
         save_rect="true"
+        single_instance="true"
+        reuse_instance="true"
         legacy_header_height="18"
         can_resize="true"
         height="465"
-- 
cgit v1.2.3


From 4f9d8f555efe04924a7730d3c91faaae3ea56825 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 5 Oct 2018 00:16:44 +0100
Subject: SL-9809

Cap glow size at 1.99 to match FS range and fix issue with NaNs when going above that value.
---
 indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index fd9933f69f..6d12f6bb94 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -148,7 +148,7 @@
                     layout="topleft"
                     left_delta="5"
                     min_val="0"
-                    max_val="2"
+                    max_val="1.99"
                     name="glow_size"
                     top_delta="15"
                     width="250"
-- 
cgit v1.2.3


From d83f08cab790721a0905fef51144514eadc757f9 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 5 Oct 2018 11:50:23 +0300
Subject: SL-9819 [EEP] Allign Show Empty Folders checkbox to the Environment
 list.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index dd05dd5a20..a11a2c1200 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -125,8 +125,8 @@
                     label="Show Empty Folders"
                     layout="topleft"
                     name="chk_showfolders"
-                    top="0"
-                    left_delta="-3"
+                    top="2"
+                    left_delta="-1"
                     width="200" />
         </layout_panel>
         <layout_panel
@@ -139,7 +139,7 @@
             <panel
                     background_visible="true"
                     bevel_style="none"
-                    top_pad="0"
+                    top_pad="1"
                     follows="top|left|right"
                     height="30"
                     label="bottom_panel"
-- 
cgit v1.2.3


From 28506a3405ddde2234b8d1d287031043f8ea92ad Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 5 Oct 2018 14:10:27 +0300
Subject: =?UTF-8?q?SL-9821=20FIXED=20[EEP]=20The=20bottom=20scrollbar=20do?=
 =?UTF-8?q?es=20not=20work=20in=20the=20=E2=80=98Pick:=20Select=20Settings?=
 =?UTF-8?q?=E2=80=99=20floater?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/xui/en/floater_settings_picker.xml     | 33 ++++++++++------------
 1 file changed, 15 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 2258a1dc24..2862d1ae37 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -29,8 +29,6 @@
             left="6"
             right="-6"
             bottom="-10"
-            auto_resize="true"
-            user_resize="true"
             orientation="vertical">
         <layout_panel name="temp"
                 border="false"
@@ -49,30 +47,29 @@
                     name="flt_inventory_search"
                     top="4"
                     right="-2" />
-            <inventory_panel
+            <panel
+              name="pnl_inv_wrap"
+              follows="all"
+              layout="topleft"
+              left="2"
+              top="2"
+              right="-2"
+              bottom="-2"
+              background_visible="true"
+              bg_alpha_color="DkGray2">
+                <inventory_panel
                     allow_multi_select="false"
                     suppress_folder_menu="true"
                     bg_visible="true"
                     bg_alpha_color="DkGray2"
                     border="false"
-                    follows="left|top|right|bottom"
+                    follows="all"
                     left_delta="0"
                     name="pnl_inventory"
-                    top="31"
+                    top="1"
                     right="-4"
-                    bottom="-26"
-                     /> 
-            <check_box
-                    follows="left|bottom"
-                    height="14"
-                    initial_value="false"
-                    label="Show folders"
-                    layout="topleft"
-                    name="chk_showfolders"
-                    top="-20"
-                    top_pad="0"
-                    left_delta="-3"
-                    width="200" />
+                    bottom="-1" />
+            </panel>
         </layout_panel>
         <layout_panel name="temp"
                 border="false"
-- 
cgit v1.2.3


From 5eed233618abd7020e130799be2abe0f986543f6 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 5 Oct 2018 21:32:42 +0100
Subject: SL-1925

More settings for rainbow/halo atmospheric effects, final default asset UUIDs, and shader mods.
---
 .../default/xui/en/panel_settings_sky_density.xml  | 56 ++++++++++++++++++++--
 1 file changed, 53 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
index e9aa07957e..a21ba44b32 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -22,7 +22,7 @@
                 auto_resize="true"
                 user_resize="false"
                 visible="true"
-                height="14">
+                height="12">
             <slider
                     decimal_digits="6"
                     follows="left|top"
@@ -101,7 +101,7 @@
                 auto_resize="true"
                 user_resize="false"
                 visible="true"
-                height="16">
+                height="14">
             <slider
                     decimal_digits="6"
                     follows="left|top"
@@ -195,7 +195,7 @@
                 auto_resize="true"
                 user_resize="false"
                 visible="true"
-                height="14">
+                height="12">
             <slider
                     decimal_digits="6"
                     follows="left|top"
@@ -269,5 +269,55 @@
                     label_width="160"
                     can_edit_text="true"/>
         </layout_panel>
+        <layout_panel
+                border="true"
+                bevel_style="in"
+                auto_resize="true"
+                user_resize="false"
+                visible="true"
+                height="14">
+             <slider
+                    decimal_digits="3"
+                    follows="left|top"
+                    height="14"
+                    increment="0.001"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="0"
+                    max_val="1"
+                    name="moisture_level"
+                    label="Moisture Level:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="14"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="5.0"
+                    max_val="1000.0"
+                    name="droplet_radius"
+                    label="Droplet Radius:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="1"
+                    follows="left|top"
+                    height="14"
+                    increment="0.1"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="0"
+                    max_val="1"
+                    name="ice_level"
+                    label="Ice Level:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+        </layout_panel>
     </layout_stack>
 </panel> 
-- 
cgit v1.2.3


From 6bb496625f4492fabd44bd0e86acb8b599df8c43 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 8 Oct 2018 20:27:10 +0300
Subject: SL-9746 [EEP] Local Texture options should work with EEP

---
 indra/newview/skins/default/xui/en/notifications.xml | 16 ++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml       |  7 +++++++
 2 files changed, 23 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 69503cdbf2..23e1701dc6 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6071,6 +6071,22 @@ This day cycle file references a missing sky file: [SKY].
 Sorry, the settings couldn't be applied to the region. Reason: [FAIL_REASON]
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="WLLocalTextureDayBlock"
+   type="alertmodal">
+A Local texture is in use on track [TRACK], frame #[FRAMENO] ([FRAME]%) in field [FIELD].
+Settings may not be saved using local textures.
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="WLLocalTextureFixedBlock"
+   type="alertmodal">
+A local texture is in use in field [FIELD].
+Settings may not be saved using local textures.
+  </notification>
+
   <notification
    functor="GenericAcknowledge"
    icon="alertmodal.tga"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8681c867bd..39c2cb79ad 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2782,6 +2782,13 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="RegionSettings">Region Settings</string>
 	<string name="NoEnvironmentSettings">This Region does not support environmental settings.</string>
 
+	<string name="EnvironmentSun">Sun</string>
+	<string name="EnvironmentMoon">Moon</string>
+	<string name="EnvironmentBloom">Bloom</string>
+	<string name="EnvironmentCloudNoise">Cloud Noise</string>
+	<string name="EnvironmentNormalMap">Normal Map</string>
+	<string name="EnvironmentTransparent">Transparent</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 ffc6393309d06446f9d1361f0f0282b2110768ae Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 8 Oct 2018 22:08:35 +0100
Subject: SL-9751

Add optional moon brightness setting
---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  |  6 ++---
 .../default/xui/en/panel_settings_sky_sunmoon.xml  | 29 +++++++++++++++++++---
 2 files changed, 29 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index e1c08a24f2..9aa7c6f499 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -6,9 +6,9 @@
         save_rect="false"
         title="Edit Day Cycle"
         width="705"
-        height="650"
+        height="700"
         min_width="705"
-        min_height="650"
+        min_height="700"
         single_instance="true" 
         can_resize="false">
 
@@ -25,7 +25,7 @@
     <!-- Layout -->
     <layout_stack name="outer_stack"
             width="705"
-            height="650"
+            height="700"
             follows="all"
             animate="false"
             top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 6d12f6bb94..1332ecd965 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -14,14 +14,14 @@
             top="5"
             right="-5"
             bottom="-5"
-            orientation="hoizontal">
+            orientation="horizontal">
         <layout_panel
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
                 user_resize="false"
                 visible="true"
-                height="350">
+                height="400">
             <text
                     follows="left|top"
                     height="10"
@@ -176,6 +176,29 @@
                     top_delta="15"
                     width="250"
                     can_edit_text="true"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="-5"
+                    top_delta="22"
+                    width="200">
+                Moon Brightness:
+            </text>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0.0"
+                    max_val="1.0"
+                    name="moon_brightness"
+                    top_delta="15"
+                    width="250"
+                    can_edit_text="true"/>
         </layout_panel>
         <layout_panel
                 border="false"
@@ -183,7 +206,7 @@
                 auto_resize="true"
                 user_resize="false"
                 visible="true"
-                height="350">
+                height="400">
             <layout_stack 
                     left="5"
                     top="5"
-- 
cgit v1.2.3


From f8aac192378462b5824d28808ed84833e2cbfe0f Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 9 Oct 2018 18:44:43 +0100
Subject: SL-1289

add cloud_variance control for randomized perturbance of clouds to break up tiling monotony
---
 .../default/xui/en/panel_settings_sky_clouds.xml   | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 886e3c1e04..325df39f87 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -88,6 +88,29 @@
                     top_delta="20"
                     width="214"
                     can_edit_text="true"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="-5"
+                    top_delta="25"
+                    width="200">
+                Cloud Variance:
+            </text>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0"
+                    max_val="1.0"
+                    name="cloud_variance"
+                    top_delta="20"
+                    width="214"
+                    can_edit_text="true"/>
             <text
                     follows="left|top"
                     height="10"
@@ -244,4 +267,4 @@
                     can_edit_text="true"/>
         </layout_panel>
     </layout_stack>
-</panel>                
\ No newline at end of file
+</panel>                
-- 
cgit v1.2.3


From 83b508a656aebedff915b2fdcd292432a8aaa7b2 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 9 Oct 2018 21:36:25 +0300
Subject: Backed out SL-9733 - more work needs to be done

---
 indra/newview/skins/default/xui/en/floater_my_environments.xml | 5 ++---
 indra/newview/skins/default/xui/en/floater_settings_picker.xml | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index 4384c01033..a11a2c1200 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -102,7 +102,7 @@
                     background_visible="true"
                     bg_alpha_color="DkGray2"
                     border="true">
-                <asset_filtered_inv_panel
+                <inventory_panel
                        left="0"
                        top="0"
                        right="-1"
@@ -110,8 +110,7 @@
                        allow_multi_select="false"
                        follows="all"
                        layout="topleft"
-                       name="pnl_settings"
-                       filter_asset_type="settings"/>
+                       name="pnl_settings"/>
             </panel>
         </layout_panel>
         <layout_panel
diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 7cc2c517ca..2862d1ae37 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -57,7 +57,7 @@
               bottom="-2"
               background_visible="true"
               bg_alpha_color="DkGray2">
-                <asset_filtered_inv_panel
+                <inventory_panel
                     allow_multi_select="false"
                     suppress_folder_menu="true"
                     bg_visible="true"
@@ -68,8 +68,7 @@
                     name="pnl_inventory"
                     top="1"
                     right="-4"
-                    bottom="-1"
-                    filter_asset_type="settings" />
+                    bottom="-1" />
             </panel>
         </layout_panel>
         <layout_panel name="temp"
-- 
cgit v1.2.3


From 4b174a31c8db1bf7f378f9b088c1335651a34ec5 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 10 Oct 2018 00:44:34 +0100
Subject: Move moisture/ice/droplet radius controls to atmos tab instead of
 (hidden) density tab.

Make frag shader version of vert WL shader to include rainbow/halo effect in non-advanced WL sky.
---
 .../default/xui/en/panel_settings_sky_atmos.xml    | 63 ++++++++++++++++++++++
 .../default/xui/en/panel_settings_sky_density.xml  | 50 -----------------
 2 files changed, 63 insertions(+), 50 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 18c2ac0db9..5af009e3aa 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -147,6 +147,69 @@
                             top_delta="20"
                             width="207"
                             can_edit_text="true"/>
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_delta="25"
+                            width="80">
+                        Moisture Level:
+                    </text>
+                     <slider
+                            decimal_digits="3"
+                            follows="left|top"
+                            height="14"
+                            increment="0.001"
+                            initial_value="0"
+                            layout="topleft"
+                            min_val="0"
+                            max_val="1"
+                            name="moisture_level"
+                            width="207"
+                            can_edit_text="true"/>
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_delta="25"
+                            width="80">
+                        Droplet Radius:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="14"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            min_val="5.0"
+                            max_val="1000.0"
+                            name="droplet_radius"
+                            width="207"
+                            can_edit_text="true"/>
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_delta="25"
+                            width="80">
+                        Ice Level:
+                    </text>
+                    <slider
+                            decimal_digits="1"
+                            follows="left|top"
+                            height="14"
+                            increment="0.1"
+                            initial_value="0"
+                            layout="topleft"
+                            min_val="0"
+                            max_val="1"
+                            name="ice_level"
+                            width="207"
+                            can_edit_text="true"/>
                     <text
                             follows="left|top"
                             height="10"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
index a21ba44b32..b3a33961bc 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -269,55 +269,5 @@
                     label_width="160"
                     can_edit_text="true"/>
         </layout_panel>
-        <layout_panel
-                border="true"
-                bevel_style="in"
-                auto_resize="true"
-                user_resize="false"
-                visible="true"
-                height="14">
-             <slider
-                    decimal_digits="3"
-                    follows="left|top"
-                    height="14"
-                    increment="0.001"
-                    initial_value="0"
-                    layout="topleft"
-                    min_val="0"
-                    max_val="1"
-                    name="moisture_level"
-                    label="Moisture Level:"
-                    width="400"
-                    label_width="160"
-                    can_edit_text="true"/>
-            <slider
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="14"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    min_val="5.0"
-                    max_val="1000.0"
-                    name="droplet_radius"
-                    label="Droplet Radius:"
-                    width="400"
-                    label_width="160"
-                    can_edit_text="true"/>
-            <slider
-                    decimal_digits="1"
-                    follows="left|top"
-                    height="14"
-                    increment="0.1"
-                    initial_value="0"
-                    layout="topleft"
-                    min_val="0"
-                    max_val="1"
-                    name="ice_level"
-                    label="Ice Level:"
-                    width="400"
-                    label_width="160"
-                    can_edit_text="true"/>
-        </layout_panel>
     </layout_stack>
 </panel> 
-- 
cgit v1.2.3


From fdde250d58403c00f3b74f7503b48f624bbdf408 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 10 Oct 2018 16:10:16 +0300
Subject: SL-9733 Added prefiltered inventory panel to prevent creation of
 unneeded views

---
 indra/newview/skins/default/xui/en/floater_my_environments.xml | 5 +++--
 indra/newview/skins/default/xui/en/floater_settings_picker.xml | 5 +++--
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml    | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index a11a2c1200..4384c01033 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -102,7 +102,7 @@
                     background_visible="true"
                     bg_alpha_color="DkGray2"
                     border="true">
-                <inventory_panel
+                <asset_filtered_inv_panel
                        left="0"
                        top="0"
                        right="-1"
@@ -110,7 +110,8 @@
                        allow_multi_select="false"
                        follows="all"
                        layout="topleft"
-                       name="pnl_settings"/>
+                       name="pnl_settings"
+                       filter_asset_type="settings"/>
             </panel>
         </layout_panel>
         <layout_panel
diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 2862d1ae37..7cc2c517ca 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -57,7 +57,7 @@
               bottom="-2"
               background_visible="true"
               bg_alpha_color="DkGray2">
-                <inventory_panel
+                <asset_filtered_inv_panel
                     allow_multi_select="false"
                     suppress_folder_menu="true"
                     bg_visible="true"
@@ -68,7 +68,8 @@
                     name="pnl_inventory"
                     top="1"
                     right="-4"
-                    bottom="-1" />
+                    bottom="-1"
+                    filter_asset_type="settings" />
             </panel>
         </layout_panel>
         <layout_panel name="temp"
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 53618b684b..90e2bb0923 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -152,7 +152,7 @@
      name="inventory search editor"
      top="20"
      width="231" />
-    <inventory_panel
+    <asset_filtered_inv_panel
      allow_multi_select="false"
      bg_visible="true"
      bg_alpha_color="DkGray2"
@@ -163,7 +163,8 @@
      left_delta="0"
      name="inventory panel"
      top_pad="4"
-     width="231" />
+     width="231"
+     filter_asset_type="texture"/>
      <check_box
      height="14"
      initial_value="false"
-- 
cgit v1.2.3


From 79d33f9d19a0c6e5ed34ffbd01a31cb2625e1ecc Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 10 Oct 2018 18:44:03 +0100
Subject: Fix names of WATER_BLUR_MULTIPILER.

Give wave direction uniforms more meaningful names in shaders.

Add comments on glow size/focus conversions for clarity.
---
 .../default/xui/en/panel_settings_sky_sunmoon.xml  | 46 +++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 1332ecd965..371ecd74bd 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -176,29 +176,6 @@
                     top_delta="15"
                     width="250"
                     can_edit_text="true"/>
-            <text
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left_delta="-5"
-                    top_delta="22"
-                    width="200">
-                Moon Brightness:
-            </text>
-            <slider
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_delta="5"
-                    min_val="0.0"
-                    max_val="1.0"
-                    name="moon_brightness"
-                    top_delta="15"
-                    width="250"
-                    can_edit_text="true"/>
         </layout_panel>
         <layout_panel
                 border="false"
@@ -287,6 +264,29 @@
                             top_delta="15"
                             width="130"
                             can_edit_text="true"/>
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_delta="22"
+                            width="200">
+                        Brightness:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0.0"
+                            max_val="1.0"
+                            name="moon_brightness"
+                            top_delta="15"
+                            width="250"
+                            can_edit_text="true"/>
                 </layout_panel>
             </layout_stack>
         </layout_panel>
-- 
cgit v1.2.3


From 89a9eb1e54bbc421006ade44ba048b00e0a5a4a3 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 10 Oct 2018 19:09:25 +0100
Subject: Fix width of moon brightness slider in XUI.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 371ecd74bd..e63b7e41b4 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -285,7 +285,7 @@
                             max_val="1.0"
                             name="moon_brightness"
                             top_delta="15"
-                            width="250"
+                            width="130"
                             can_edit_text="true"/>
                 </layout_panel>
             </layout_stack>
-- 
cgit v1.2.3


From 451b47637274ef43973bb880bbc3192bf18b46a0 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 12 Oct 2018 15:06:14 +0300
Subject: SL-9867 EEP Set the cloud speed 2d vector control max to [-10 - 10]

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 325df39f87..0816d8212d 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -128,10 +128,10 @@
                     visible="true"
                     left_delta="0"
                     top_delta="21"
-                    min_val_x="-30"
-                    max_val_x="30"
-                    min_val_y="-30"
-                    max_val_y="30" />
+                    min_val_x="-10"
+                    max_val_x="10"
+                    min_val_y="-10"
+                    max_val_y="10" />
 
             <text
                     follows="left|top"
-- 
cgit v1.2.3


From 38e92308177db15579d0892bc80bdbbd18ddbc6c Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 19 Oct 2018 13:06:15 +0300
Subject: SL-9921 [EEP] Rename the tooltip for trash icon to 'Remove selected
 item'

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index 4384c01033..c9238b80b3 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -184,7 +184,7 @@
                         layout="topleft"
                         name="btn_del"
                         right="-5"
-                        tool_tip="Delete this setting"
+                        tool_tip="Remove selected item"
                         top_delta="0"
                         width="18" />
             </panel>
-- 
cgit v1.2.3


From 539780f3dced4960dbe3d99756c3f05070701013 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 19 Oct 2018 13:33:33 +0300
Subject: =?UTF-8?q?SL-9923=20FIXED=20[EEP]=20The=20sliders=20on=20the=20?=
 =?UTF-8?q?=E2=80=98Atmosphere=20&=20Lighting=E2=80=99=20tab=20are=20offse?=
 =?UTF-8?q?t=20from=20each=20other?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newview/skins/default/xui/en/panel_settings_sky_atmos.xml  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 5af009e3aa..e6fdc76de1 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -162,6 +162,8 @@
                             height="14"
                             increment="0.001"
                             initial_value="0"
+                            left_delta="5"
+                            top_delta="20"
                             layout="topleft"
                             min_val="0"
                             max_val="1"
@@ -183,6 +185,8 @@
                             height="14"
                             increment="0.01"
                             initial_value="0"
+                            left_delta="5"
+                            top_delta="20"
                             layout="topleft"
                             min_val="5.0"
                             max_val="1000.0"
@@ -204,6 +208,8 @@
                             height="14"
                             increment="0.1"
                             initial_value="0"
+                            left_delta="5"
+                            top_delta="20"
                             layout="topleft"
                             min_val="0"
                             max_val="1"
@@ -230,7 +236,7 @@
                             max_val="20"
                             name="scene_gamma"
                             top_delta="20"
-                            width="214"
+                            width="207"
                             can_edit_text="true"/>
                 </layout_panel>            
                 <layout_panel
@@ -261,7 +267,7 @@
                             max_val="2"
                             name="density_multip"
                             top_delta="20"
-                            width="207"
+                            width="219"
                             can_edit_text="true"/>
                     <text
                             follows="left|top"
-- 
cgit v1.2.3


From ab9a66d5fe8a85f741cc0597be01586bd55704b0 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 19 Oct 2018 14:38:12 +0300
Subject: SL-9919 [EEP] Change width for "Large Wave Speed" text field

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index eead03d185..55d104f7b2 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -178,6 +178,7 @@
                     <text
                             follows="left|top"
                             height="16"
+                            width="120"
                             layout="topleft"
                             top_delta="-20"
                             left_delta="175">
-- 
cgit v1.2.3


From e9faa3cce8897af2a4303538672e2262ed39520a Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 25 Oct 2018 18:16:34 +0300
Subject: SL-9960 [EEP] Allow drag and drop inventory setting to the "Settings
 from Inventory" field

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

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

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 cfbe25129b..18364bbf0b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -102,6 +102,14 @@
                             width="200">
                         Unknown
                     </line_editor>
+                    <settings_drop_target
+                     height="20"
+                     top_pad="-20"
+                     follows="top|left"
+                     layout="topleft"
+                     name="sdt_drop_target"
+                     tool_tip="Drag a setting from Inventory onto this target box to select it as current evironment."
+                     width="200" />
                     <button
                             name="btn_select_inventory"
                             follows="top|left"
-- 
cgit v1.2.3


From 045ddf0b02b3cbe5e5c9575eef63112ad12ddb12 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 14 Nov 2018 15:43:31 +0200
Subject: SL-10056 [EEP] Cloud Detail settings >1.0 always reverts to 1.0

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 0816d8212d..457082ede2 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -260,7 +260,7 @@
                     layout="topleft"
                     left_delta="0"
                     min_val="0"
-                    max_val="2"
+                    max_val="1"
                     name="cloud_detail_d"
                     top_delta="20"
                     width="200"
-- 
cgit v1.2.3


From 49f4b68b31a8299fc1b796102bea6da6de8b6115 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Tue, 23 Oct 2018 10:15:04 +0300
Subject: SL-9941 EEP XY_Vector improvement - logarithmic scale mode

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 457082ede2..11a852f40b 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -128,10 +128,11 @@
                     visible="true"
                     left_delta="0"
                     top_delta="21"
-                    min_val_x="-10"
-                    max_val_x="10"
-                    min_val_y="-10"
-                    max_val_y="10" />
+                    min_val_x="-30"
+                    max_val_x="30"
+                    min_val_y="-30"
+                    max_val_y="30" 
+                    logarithmic="1"/>
 
             <text
                     follows="left|top"
-- 
cgit v1.2.3


From 8067bd824ecbf0f2c63a27937f3e36c4cbc99418 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 21 Nov 2018 12:51:41 -0800
Subject: SL-10117: Include environment changes in experience agreement.

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 39c2cb79ad..33c2224b9d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -531,6 +531,7 @@ http://secondlife.com/support for help fixing this problem.
 	<string name="ManageEstateSilently">Manage your estates silently</string>
 	<string name="ChangeYourDefaultAnimations">Change your default animations</string>
 	<string name="ForceSitAvatar">Force your avatar to sit</string>
+    <string name="ChangeEnvSettings">Change your environment settings</string>
 	
 	<string name="NotConnected">Not Connected</string>
 	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
-- 
cgit v1.2.3


From 1f1d29e3462fb0adff9342b657160441d5b992d0 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 28 Nov 2018 15:05:30 +0200
Subject: SL-9787 EEP Remove Apply to Region from right-click menus.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 6f04785e8c..9b24e2ffcf 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -880,13 +880,6 @@
                 function="Inventory.DoToSelected"
                 parameter="apply_settings_parcel" />
     </menu_item_call>
-    <menu_item_call
-            name="Settings Apply Region"
-            layout="topleft"
-            label="Apply To Region">
-        <menu_item_call.on_click 
-                function="Inventory.DoToSelected"
-                parameter="apply_settings_region" />
     </menu_item_call>
 	<menu_item_separator
 	 layout="topleft"
-- 
cgit v1.2.3


From 58ffb2e4b11d7aaf1fb66531f4925bd359f551cb Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 29 Nov 2018 17:55:23 +0200
Subject: SL-10141 FIXED [EEP] Neighboring sky levels may be closer than 100
 meters to each other in edit mode

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

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

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 18364bbf0b..2f91252d9b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -252,6 +252,7 @@
                     width="17"
                     orientation="vertical"
                     increment="10"
+                    overlap_threshold="100"
                     min_val="100"
                     max_val="4000"
                     layout="topleft"
-- 
cgit v1.2.3


From d66012f85e885679738cf8c488fd8ff460319c85 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 30 Nov 2018 17:48:08 +0200
Subject: SL-9716 [EEP] "Use Shared Environment" does not enable when applying
 an environment to a parcel or region

---
 indra/newview/skins/default/xui/en/menu_inventory.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 9b24e2ffcf..33ecb4477a 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -879,7 +879,6 @@
         <menu_item_call.on_click 
                 function="Inventory.DoToSelected"
                 parameter="apply_settings_parcel" />
-    </menu_item_call>
     </menu_item_call>
 	<menu_item_separator
 	 layout="topleft"
-- 
cgit v1.2.3


From 2f188b36d9b892e48ba72c3485b34036273d755b Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 5 Dec 2018 17:14:06 +0200
Subject: SL-10167 Change wording on Add/Load/Delete buttons in the day editor

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 9aa7c6f499..cac6f334c7 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -21,6 +21,8 @@
     <!-- Substitutions -->
     <string name="time_label"> ([HH]:[MM])</string>
     <string name="sky_track_label">Sky [ALT]</string>
+    <string name="sky_label">Sky</string>
+    <string name="water_label">Water</string>
 
     <!-- Layout -->
     <layout_stack name="outer_stack"
@@ -400,7 +402,7 @@
                                 follows="top|left"
                                 height="23"
                                 width="90"
-                                label="Add Frame"
+                                label="Add [FRAME]"
                                 left_pad="175"
                                 top_delta="-20"
                                 name="add_frame" />
@@ -408,7 +410,7 @@
                                 follows="top|left"
                                 height="23"
                                 width="90"
-                                label="Load Frame"
+                                label="Load [FRAME]"
                                 top_pad="0"
                                 left_delta="0"
                                 name="btn_load_frame" />
@@ -416,7 +418,7 @@
                                 follows="left|top"
                                 height="23"
                                 width="90"
-                                label="Delete Frame"
+                                label="Delete [FRAME]"
                                 top_pad="0"
                                 left_delta="0"
                                 name="delete_frame" />
-- 
cgit v1.2.3


From ca336f26db4446b016ab89654bf75f7651294533 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 10 Dec 2018 17:35:29 +0200
Subject: SL-9698 [EEP] Add beacons that point to sun & moon position

---
 .../skins/default/xui/en/floater_beacons.xml       | 41 ++++++++++++++++++++--
 indra/newview/skins/default/xui/en/strings.xml     |  2 ++
 2 files changed, 41 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml
index 3d29356b22..d5947fc0af 100644
--- a/indra/newview/skins/default/xui/en/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/en/floater_beacons.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="245"
+ height="310"
  layout="topleft"
  name="beacons"
  help_topic="beacons"
@@ -12,7 +12,7 @@
  width="240">
     <panel
      follows="left|top|right|bottom"
-     height="240"
+     height="305"
      layout="topleft"
      left="10"
      name="beacons_panel"
@@ -143,6 +143,43 @@
           <check_box.commit_callback
            function="Beacons.UICheck" />
         </check_box>
+        <view_border
+         bevel_style="in"
+         height="0"
+         layout="topleft"
+         left="0"
+         name="cost_text_border"
+         top_pad="5"
+         width="220"/>
+        <text
+         follows="all"
+         height="16"
+         font="SansSerif"
+         left="0"
+         top_pad="7"
+         name="label_objects"
+         text_color="White"
+         type="string">
+           Show direction to:
+         </text>
+        <check_box
+         control_name="sunbeacon"
+         height="16"
+         label="Sun"
+         layout="topleft"
+         name="sun" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+        <check_box
+         control_name="moonbeacon"
+         height="16"
+         label="Moon"
+         layout="topleft"
+         name="moon" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
 
     </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 33c2224b9d..10e98719a4 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4094,6 +4094,8 @@ Try enclosing path to the editor with double quotes.
   <string name="BeaconScriptedTouch">Viewing scripted object with touch function beacons (red)</string>
   <string name="BeaconSound">Viewing sound beacons (yellow)</string>
   <string name="BeaconMedia">Viewing media beacons (white)</string>
+  <string name="BeaconSun">Viewing sun direction beacon (orange)</string>
+  <string name="BeaconMoon">Viewing moon direction beacon (purple)</string>
   <string name="ParticleHiding">Hiding Particles</string>
 
   <!-- commands -->
-- 
cgit v1.2.3


From 634910f685057c50ae3233d9f71d4b21cf958749 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 14 Dec 2018 14:33:42 -0800
Subject: SL-10241: Group roll for changing environment.

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

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

diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index f79d752fdb..bda08f3421 100644
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -92,7 +92,10 @@
 		<action description="Toggle various About Land &gt; Options settings"
 		     longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Edit Terrain&apos;, &apos;Build&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab."
 		     name="land options" value="22" />
-	</action_set>
+    <action description="Modify environment settings and day cycle."
+		     longdescription="Change the environment settings and day cycle from the About Land &gt; Environment tab."
+		     name="land change environment" value="46" />
+  </action_set>
 	<action_set
 	     description="These Abilities include powers which allow Members to bypass restrictions on group-owned parcels."
 	     name="Parcel Powers">
-- 
cgit v1.2.3


From 8227a0b270f6e7cc521adeb7b97ad2d5fb646973 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 21 Dec 2018 15:30:57 -0800
Subject: SL-10279: Rework the environment pannel.  Still in progress.

---
 .../default/xui/en/panel_region_environment.xml    | 543 ++++++++++++++++++---
 1 file changed, 486 insertions(+), 57 deletions(-)

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

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 2f91252d9b..1c2657ea60 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -16,6 +16,7 @@
     <string name="str_no_parcel">No parcel is selected. Environmental settings are disabled.</string>
     <string name="str_cross_region">Environmental settings are not available across region boundries.</string>
     <string name="str_legacy">Environmental settings are not available on this region.</string>
+    <string name="str_empty">(empty)</string>
     <layout_stack 
             width="530"
             height="367"
@@ -29,14 +30,438 @@
                 name="pnl_environment_disabled"
                 visible="false">
             <text follows="top|left|bottom|right"
-                            halign="center"
-                            valign="top"
-                            top_pad="40"
-                            name="txt_environment_disabled"
-                            text_color="white">
-            ...
+                    halign="center"
+                    valign="top"
+                    top_pad="40"
+                    name="txt_environment_disabled"
+                    text_color="white">
+                ...
             </text>
         </layout_panel>
+        <layout_panel
+                auto_resize="true"
+                user_resize="false"
+                min_height="0"
+                name="pnl_environment_config"
+                visible="true">
+            <layout_stack 
+                    xxxwidth="530"
+                    xxxheight="367"
+                    follows="all"
+                    layout="topleft"
+                    animate="false"
+                    orientation="horizontal">
+                <layout_panel
+                        auto_resize="true"
+                        user_resize="false"
+                        min_height="0"
+                        top="5"
+                        name="pnl_environment_altitudes"
+                        visible="true">
+                        <text follows="top|left"
+                                font="SansSerif"
+                                halign="left"
+                                text_color="white"
+                                left="5"
+                                top="2">Sky Altitudes</text>
+                        <multi_slider
+                                height="270"
+                                follows="top|left"
+                                orientation="vertical"
+                                increment="25"
+                                min_val="100"
+                                max_val="4000"
+                                thumb_image="Inv_SettingsSky"
+                                thumb_width="17"
+                                thumb_highlight_color="white"
+                                decimal_digits="0"
+                                draw_track="true"
+                                overlap_threshold="100"
+                                initial_value="0"
+                                layout="topleft"
+                                left="10"
+                                max_sliders="3"
+                                name="sld_altitudes"
+                                show_text="false"
+                                top_pad="20"
+                                use_triangle="false"
+                                width="17">
+                            <slider name="sld1"
+                                    value="1000"/>
+                            <slider name="sld2"
+                                    value="2000"/>
+                            <slider name="sld3"
+                                    value="3000"/>
+                        </multi_slider>
+                        <icon
+                                follows="top|left"
+                                height="17"
+                                width="17"
+                                image_name="Inv_SettingsSky"
+                                layout="topleft"
+                                name="icon_ground"
+                                mouse_opaque="false"
+                                visible="true"
+                                left="10"
+                                xxxleft_delta="0"
+                                top_pad="10"/>
+                        <text
+                                type="string"
+                                length="1"
+                                follows="left|top"
+                                height="12"
+                                layout="topleft"
+                                left_pad="8"
+                                top_delta="2"
+                                width="50"
+                                name="ground_name">
+                            Ground
+                        </text>
+                    <line_editor
+                            follows="top|right"
+                            enabled="false"
+                            top_delta="-3"
+                            right="-5"
+                            xxxleft="-160"
+                            height="20"
+                            layout="topleft"
+                            name="edt_invname_ground"
+                            width="155">
+                        Unknown
+                    </line_editor>
+                    <settings_drop_target
+                            height="20"
+                            top_delta="0"
+                            left_delta="0"
+                            follows="top|left"
+                            layout="topleft"
+                            name="sdt_ground"
+                            tool_tip="Drag a setting from Inventory onto this target box to select it as the ground level sky."
+                            width="155" />
+                        
+                        <icon
+                                follows="left|top"
+                                height="17"
+                                width="17"
+                                image_name="Inv_SettingsWater"
+                                layout="topleft"
+                                name="icon_water"
+                                mouse_opaque="false"
+                                visible="true"
+                                left="10"
+                                top_pad="10"/>
+                        <text
+                                type="string"
+                                length="1"
+                                follows="left|top"
+                                height="12"
+                                layout="topleft"
+                                left_pad="8"
+                                top_delta="2"
+                                width="200"
+                                name="water_name">
+                            Water
+                        </text>
+                    <line_editor
+                            follows="top|right"
+                            enabled="false"
+                            top_delta="-3"
+                            right="-5"
+                            xxxleft="-160"
+                            height="20"
+                            layout="topleft"
+                            name="edt_invname_water"
+                            width="155">
+                        Unknown
+                    </line_editor>
+                    <settings_drop_target
+                            height="20"
+                            top_delta="0"
+                            left_delta="0"
+                            follows="top|left"
+                            layout="topleft"
+                            name="sdt_water"
+                            tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
+                            width="155" />
+                        
+                        <text
+                                type="string"
+                                length="1"
+                                follows="left"
+                                height="12"
+                                layout="topleft"
+                                left="35"
+                                top="30"
+                                width="200"
+                                name="alt1">
+                            Sky [INDEX]([ALTITUDE]m)
+                        </text>
+                    <line_editor
+                            follows="top|right"
+                            enabled="false"
+                            top_delta="-3"
+                            right="-5"
+                            xxxleft="-160"
+                            height="20"
+                            layout="topleft"
+                            name="edt_invname_alt1"
+                            width="155">
+                        Unknown
+                    </line_editor>
+                    <settings_drop_target
+                            height="20"
+                            top_delta="0"
+                            left_delta="0"
+                            follows="top|left"
+                            layout="topleft"
+                            name="sdt_alt2"
+                            tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
+                            width="155" />
+                        
+                        <text
+                                type="string"
+                                length="1"
+                                follows="left|top"
+                                height="12"
+                                layout="topleft"
+                                left="35"
+                                top="40"
+                                width="200"
+                                name="alt2">
+                            Sky [INDEX]([ALTITUDE]m)
+                        </text>
+                    <line_editor
+                            follows="top|right"
+                            enabled="false"
+                            top_delta="-3"
+                            right="-5"
+                            xxxleft="-160"
+                            height="20"
+                            layout="topleft"
+                            name="edt_invname_alt2"
+                            width="155">
+                        Unknown
+                    </line_editor>
+                    <settings_drop_target
+                            height="20"
+                            top_delta="0"
+                            left_delta="0"
+                            follows="top|left"
+                            layout="topleft"
+                            name="sdt_alt2"
+                            tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
+                            width="155" />
+                        
+                        <text
+                                type="string"
+                                length="1"
+                                follows="left|top"
+                                height="12"
+                                layout="topleft"
+                                left="35"
+                                top="50"
+                                width="200"
+                                name="alt3">
+                            Sky [INDEX]([ALTITUDE]m)
+                        </text>
+                    <line_editor
+                            follows="top|right"
+                            enabled="false"
+                            top_delta="-3"
+                            right="-5"
+                            xxxleft="-160"
+                            height="20"
+                            layout="topleft"
+                            name="edt_invname_alt3"
+                            width="155">
+                        Unknown
+                    </line_editor>
+                    <settings_drop_target
+                            height="20"
+                            top_delta="0"
+                            left_delta="0"
+                            follows="top|left"
+                            layout="topleft"
+                            name="sdt_alt3"
+                            tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
+                            width="155" />
+                        
+                </layout_panel>                    
+                <layout_panel
+                        auto_resize="true"
+                        user_resize="false"
+                        min_height="0"
+                        top="5"
+                        name="pnl_environment_config"
+                        visible="true">
+                    <layout_stack
+                            follows="all"
+                            layout="topleft"
+                            animate="false"
+                            orientation="vertical">
+                        <layout_panel
+                                min_height="140"
+                                follows="all"
+                                border="true"
+                                bevel_style="in"
+                                name="pnl_environment_current">
+                            <text follows="top|left"
+                                    font="SansSerif"
+                                    halign="left"
+                                    text_color="white"
+                                    top="2">Select Environment</text>
+                            <button
+                                    follows="top|left"
+                                    top_pad="20"
+                                    left_delta="10"
+                                    layout="topleft"
+                                    height="23"
+                                    label="[USEDEFAULT]"
+                                    width="120"
+                                    name="btn_usedefault"/>
+                            <button
+                                    follows="top|left"
+                                    top_pad="5"
+                                    left_delta="0"
+                                    layout="topleft"
+                                    height="23"
+                                    label="Use Inventory"
+                                    width="120"
+                                    name="btn_select_inventory"/>
+                            <button
+                                    follows="top|left"
+                                    top_pad="5"
+                                    left_delta="0"
+                                    layout="topleft"
+                                    height="23"
+                                    label="Customize"
+                                    width="120"
+                                    name="btn_edit"/>
+                            <check_box
+                                    height="20"
+                                    label="Parcel Owners May Override Environment"
+                                    layout="topleft"
+                                    left_delta="0"
+                                    top_pad="10"
+                                    name="chk_allow_override"
+                                    width="200" />
+                        </layout_panel>
+                        <layout_panel
+                                min_height="130"
+                                follows="all"
+                                border="true"
+                                bevel_style="in"
+                                name="pnl_environment_length">
+                            <text 
+                                    font="SansSerif"
+                                    follows="top|left|right"
+                                    halign="left"
+                                    text_color="white"
+                                    top="2">Day Settings</text>
+                            <text
+                                    type="string"
+                                    length="1"
+                                    follows="left|top"
+                                    height="12"
+                                    layout="topleft"
+                                    left_delta="10"
+                                    top_pad="16"
+                                    width="200">
+                                Day Length (hours)
+                            </text>
+                            <slider
+                                    can_edit_text="true"
+                                    decimal_digits="1"
+                                    follows="left|top"
+                                    height="20"
+                                    increment="0.5"
+                                    initial_value="4"
+                                    layout="topleft"
+                                    left_delta="0"
+                                    xxxright="-10"
+                                    top_pad="0"
+                                    name="sld_day_length"
+                                    min_val="4"
+                                    max_val="168"
+                                    width="240" />
+                            <text
+                                    type="string"
+                                    length="1"
+                                    follows="left|top"
+                                    height="12"
+                                    layout="topleft"
+                                    left_delta="0"
+                                    top_pad="5"
+                                    width="200">
+                                Day Offset (hours)
+                            </text>
+                            <slider
+                                    can_edit_text="true"
+                                    decimal_digits="1"
+                                    follows="left|top"
+                                    height="20"
+                                    increment="0.5"
+                                    initial_value="-8"
+                                    layout="topleft"
+                                    left_delta="0"
+                                    top_pad="0"
+                                    name="sld_day_offset"
+                                    min_val="-11.5"
+                                    max_val="12"
+                                    width="240" />
+                            <text
+                                    type="string"
+                                    length="1"
+                                    follows="left|top"
+                                    height="12"
+                                    layout="topleft"
+                                    left_delta="0"
+                                    top_pad="5"
+                                    width="200">
+                                Apparent Time of Day:
+                            </text>
+                            <text
+                                    name="lbl_apparent_time"
+                                    type="string"
+                                    length="1"
+                                    follows="left|top"
+                                    height="12"
+                                    layout="topleft"
+                                    left_delta="10"
+                                    top_pad="5"
+                                    width="200">
+                                [HH]:[MM][AP] ([PRC]%)
+                            </text>
+
+                        </layout_panel>
+                        <layout_panel
+                                follows="bottom"
+                                border="true"
+                                bevel_style="in"
+                                name="pnl_environment_buttons">
+                            <button
+                                    follows="bottom|right"
+                                    height="23"
+                                    label="Apply"
+                                    top="-60"
+                                    left="-220"
+                                    name="btn_apply"
+                                    width="100" />
+                            <button
+                                    follows="bottom|right"
+                                    height="23"
+                                    label="Reset"
+                                    layout="topleft"
+                                    left_pad="10"
+                                    top_delta="0"
+                                    name="btn_cancel"
+                                    width="100" /> 
+                        </layout_panel>
+                    </layout_stack>
+                </layout_panel>
+            </layout_stack>        
+        </layout_panel>
+        <!--
         <layout_panel 
                 auto_resize="false"
                 user_resize="false"
@@ -103,13 +528,13 @@
                         Unknown
                     </line_editor>
                     <settings_drop_target
-                     height="20"
-                     top_pad="-20"
-                     follows="top|left"
-                     layout="topleft"
-                     name="sdt_drop_target"
-                     tool_tip="Drag a setting from Inventory onto this target box to select it as current evironment."
-                     width="200" />
+                            height="20"
+                            top_pad="-20"
+                            follows="top|left"
+                            layout="topleft"
+                            name="sdt_drop_target"
+                            tool_tip="Drag a setting from Inventory onto this target box to select it as current evironment."
+                            width="200" />
                     <button
                             name="btn_select_inventory"
                             follows="top|left"
@@ -231,54 +656,57 @@
                 name="pnl_environment_altitudes"
                 visible="true">
             <panel
-                left="5"
-                top="0"
-                bottom="-1"
-                width="260"
-                follows="left|top|bottom"
-                background_visible="true"
-                border="true"
-                bevel_style="in"
-                name="cnt_panel">
+                    left="5"
+                    top="0"
+                    bottom="-1"
+                    width="260"
+                    follows="left|top|bottom"
+                    background_visible="true"
+                    border="true"
+                    bevel_style="in"
+                    name="cnt_panel">
                 <text follows="top|left"
-                    font="SansSerif"
-                    halign="left"
-                    text_color="white"
-                    top="2">Sky Altitudes</text>
+                        font="SansSerif"
+                        halign="left"
+                        text_color="white"
+                        top="2">Sky Altitudes</text>
                 <multi_slider
-                    decimal_digits="0"
-                    follows="bottom"
-                    height="123"
-                    width="17"
-                    orientation="vertical"
-                    increment="10"
-                    overlap_threshold="100"
-                    min_val="100"
-                    max_val="4000"
-                    layout="topleft"
-                    left="15"
-                    top="20"
-                    max_sliders="20"
-                    name="sld_altitudes"
-                    show_text="false"
-                    thumb_image="Inv_SettingsSky"
-                    thumb_width="17"
-                    thumb_highlight_color="white">
-                    <slider name="sld1" value="200"/>
-                    <slider name="sld2" value="400"/>
-                    <slider name="sld3" value="600"/>
+                        decimal_digits="0"
+                        follows="bottom"
+                        height="123"
+                        width="17"
+                        orientation="vertical"
+                        increment="10"
+                        overlap_threshold="100"
+                        min_val="100"
+                        max_val="4000"
+                        layout="topleft"
+                        left="15"
+                        top="20"
+                        max_sliders="20"
+                        name="sld_altitudes"
+                        show_text="false"
+                        thumb_image="Inv_SettingsSky"
+                        thumb_width="17"
+                        thumb_highlight_color="white">
+                    <slider name="sld1"
+                            value="200"/>
+                    <slider name="sld2"
+                            value="400"/>
+                    <slider name="sld3"
+                            value="600"/>
                 </multi_slider>
                 <icon
-                    follows="left|top"
-                    height="17"
-                    width="17"
-                    image_name="Inv_SettingsSky"
-                    layout="topleft"
-                    name="icon_ground"
-                    mouse_opaque="false"
-                    visible="true"
-                    left_delta="0"
-                    top_pad="-9"/>
+                        follows="left|top"
+                        height="17"
+                        width="17"
+                        image_name="Inv_SettingsSky"
+                        layout="topleft"
+                        name="icon_ground"
+                        mouse_opaque="false"
+                        visible="true"
+                        left_delta="0"
+                        top_pad="-9"/>
                 <text
                         type="string"
                         length="1"
@@ -368,5 +796,6 @@
                     width="100" /> 
 
         </layout_panel>
+-->
     </layout_stack>
 </panel>
-- 
cgit v1.2.3


From 5fe626afabd2857980e8011ceb6081f9e9f108c7 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 2 Jan 2019 15:13:47 -0800
Subject: SL-10279: Most functionality now present. Still needs some cleanup on
 the bump code.

---
 .../newview/skins/default/xui/en/notifications.xml |  6 ++++--
 .../default/xui/en/panel_region_environment.xml    | 25 +++++-----------------
 2 files changed, 9 insertions(+), 22 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5c08bf50f6..b4cfe9d1b5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4811,10 +4811,12 @@ Unchecking this option may remove restrictions that parcel owners have added to
    icon="alertmodal.tga"
    name="EstateParcelEnvironmentOverride"
    type="alertmodal">
-Unchecking this option may remove any custom environments that parcel owners have added to their parcels. Please discuss with your parcel owners as needed.
+Unchecking this option will remove any custom environments that parcel owners have added to their parcels. Please discuss with your parcel owners as needed.
+Do you wish to proceed?
     <tag>confirm</tag>
     <usetemplate
-     name="okbutton"
+     name="okcancelbuttons"
+     notext="Cancel"
      yestext="OK"/>
   </notification>
   
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 1c2657ea60..7c08262d50 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -16,6 +16,7 @@
     <string name="str_no_parcel">No parcel is selected. Environmental settings are disabled.</string>
     <string name="str_cross_region">Environmental settings are not available across region boundries.</string>
     <string name="str_legacy">Environmental settings are not available on this region.</string>
+    <string name="str_disallowed">The estate manager does not allow changing parcel environments in this region.</string>
     <string name="str_empty">(empty)</string>
     <layout_stack 
             width="530"
@@ -383,7 +384,7 @@
                                     name="sld_day_length"
                                     min_val="4"
                                     max_val="168"
-                                    width="240" />
+                                    width="237" />
                             <text
                                     type="string"
                                     length="1"
@@ -408,7 +409,7 @@
                                     name="sld_day_offset"
                                     min_val="-11.5"
                                     max_val="12"
-                                    width="240" />
+                                    width="237" />
                             <text
                                     type="string"
                                     length="1"
@@ -432,30 +433,14 @@
                                     width="200">
                                 [HH]:[MM][AP] ([PRC]%)
                             </text>
-
                         </layout_panel>
                         <layout_panel
                                 follows="bottom"
                                 border="true"
                                 bevel_style="in"
                                 name="pnl_environment_buttons">
-                            <button
-                                    follows="bottom|right"
-                                    height="23"
-                                    label="Apply"
-                                    top="-60"
-                                    left="-220"
-                                    name="btn_apply"
-                                    width="100" />
-                            <button
-                                    follows="bottom|right"
-                                    height="23"
-                                    label="Reset"
-                                    layout="topleft"
-                                    left_pad="10"
-                                    top_delta="0"
-                                    name="btn_cancel"
-                                    width="100" /> 
+<!-- used to be buttons, but now spacer.
+-->
                         </layout_panel>
                     </layout_stack>
                 </layout_panel>
-- 
cgit v1.2.3


From d607d81dba25dfe7dd1ecdf123af656ca939924f Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 2 Jan 2019 17:10:15 -0800
Subject: SL-10279: Temp fix for stale estate info when editing parcel
 environment.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index cac6f334c7..a3dbab2509 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -241,7 +241,7 @@
                         <multi_slider
                                 decimal_digits="0"
                                 follows="bottom"
-                                height="10"
+                                height="12"
                                 increment="0.005"
                                 overlap_threshold="0.026"
                                 loop_overlap="true"
@@ -252,6 +252,7 @@
                                 max_val="1"
                                 name="WLDayCycleFrames"
                                 show_text="false"
+                                thumb_width="12"
                                 top_pad="15"
                                 width="525" />
 
-- 
cgit v1.2.3


From 69a84d81728203868923bbf27f8bce0d8b0c8e86 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 4 Jan 2019 17:09:09 +0200
Subject: SL-10279 Fix altitude description repositioning code

---
 .../default/xui/en/panel_region_environment.xml    | 420 ++++++++++++---------
 1 file changed, 232 insertions(+), 188 deletions(-)

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

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 7c08262d50..7b4164268f 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -65,229 +65,273 @@
                                 text_color="white"
                                 left="5"
                                 top="2">Sky Altitudes</text>
-                        <multi_slider
-                                height="270"
-                                follows="top|left"
-                                orientation="vertical"
-                                increment="25"
-                                min_val="100"
-                                max_val="4000"
-                                thumb_image="Inv_SettingsSky"
-                                thumb_width="17"
-                                thumb_highlight_color="white"
-                                decimal_digits="0"
-                                draw_track="true"
-                                overlap_threshold="100"
-                                initial_value="0"
-                                layout="topleft"
-                                left="10"
-                                max_sliders="3"
-                                name="sld_altitudes"
-                                show_text="false"
-                                top_pad="20"
-                                use_triangle="false"
-                                width="17">
-                            <slider name="sld1"
-                                    value="1000"/>
-                            <slider name="sld2"
-                                    value="2000"/>
-                            <slider name="sld3"
-                                    value="3000"/>
-                        </multi_slider>
+                    <multi_slider
+                            height="270"
+                            follows="top|left"
+                            orientation="vertical"
+                            increment="25"
+                            min_val="100"
+                            max_val="4000"
+                            thumb_image="Inv_SettingsSky"
+                            thumb_width="17"
+                            thumb_highlight_color="white"
+                            decimal_digits="0"
+                            draw_track="true"
+                            overlap_threshold="100"
+                            initial_value="0"
+                            layout="topleft"
+                            left="10"
+                            max_sliders="3"
+                            name="sld_altitudes"
+                            show_text="false"
+                            top_pad="20"
+                            use_triangle="false"
+                            width="17">
+                        <slider name="sld1"
+                                value="1000"/>
+                        <slider name="sld2"
+                                value="2000"/>
+                        <slider name="sld3"
+                                value="3000"/>
+                    </multi_slider>
+                    <panel
+                        follows="top|left"
+                        height="21"
+                        width="222"
+                        layout="topleft"
+                        visible="true"
+                        left="10"
+                        top_pad="10"
+                        name="pnl_ground">
                         <icon
-                                follows="top|left"
-                                height="17"
-                                width="17"
-                                image_name="Inv_SettingsSky"
-                                layout="topleft"
-                                name="icon_ground"
-                                mouse_opaque="false"
-                                visible="true"
-                                left="10"
-                                xxxleft_delta="0"
-                                top_pad="10"/>
+                            follows="top|left"
+                            height="17"
+                            width="17"
+                            image_name="Inv_SettingsSky"
+                            layout="topleft"
+                            name="icon_ground"
+                            mouse_opaque="false"
+                            visible="true"
+                            top_pad="2"
+                            left_delta="0"/>
                         <text
-                                type="string"
-                                length="1"
-                                follows="left|top"
-                                height="12"
-                                layout="topleft"
-                                left_pad="8"
-                                top_delta="2"
-                                width="50"
-                                name="ground_name">
+                           type="string"
+                           length="1"
+                           follows="left|top"
+                           height="12"
+                           layout="topleft"
+                           left_pad="8"
+                           top_delta="2"
+                           width="50"
+                           name="txt_ground">
                             Ground
                         </text>
-                    <line_editor
-                            follows="top|right"
-                            enabled="false"
-                            top_delta="-3"
-                            right="-5"
-                            xxxleft="-160"
-                            height="20"
-                            layout="topleft"
-                            name="edt_invname_ground"
-                            width="155">
-                        Unknown
-                    </line_editor>
-                    <settings_drop_target
-                            height="20"
-                            top_delta="0"
-                            left_delta="0"
-                            follows="top|left"
-                            layout="topleft"
-                            name="sdt_ground"
-                            tool_tip="Drag a setting from Inventory onto this target box to select it as the ground level sky."
-                            width="155" />
-                        
+                        <line_editor
+                           follows="top|right"
+                           enabled="false"
+                           top_delta="-3"
+                           right="-5"
+                           xxxleft="-160"
+                           height="20"
+                           layout="topleft"
+                           name="edt_invname_ground"
+                           width="155">
+                            Unknown
+                        </line_editor>
+                        <settings_drop_target
+                           height="20"
+                           top_delta="0"
+                           left_delta="0"
+                           follows="top|left"
+                           layout="topleft"
+                           name="sdt_ground"
+                           tool_tip="Drag a setting from Inventory onto this target box to select it as the ground level sky."
+                           width="155" />
+                    </panel>
+                    <panel
+                         follows="top|left"
+                         height="21"
+                         width="222"
+                         layout="topleft"
+                         visible="true"
+                         left="10"
+                         top_pad="10"
+                         name="pnl_water">
                         <icon
-                                follows="left|top"
-                                height="17"
-                                width="17"
-                                image_name="Inv_SettingsWater"
-                                layout="topleft"
-                                name="icon_water"
-                                mouse_opaque="false"
-                                visible="true"
-                                left="10"
-                                top_pad="10"/>
+                           follows="left|top"
+                           height="17"
+                           width="17"
+                           image_name="Inv_SettingsWater"
+                           layout="topleft"
+                           name="icon_water"
+                           mouse_opaque="false"
+                           visible="true"
+                           top_pad="2"
+                           left_delta="0"/>
                         <text
-                                type="string"
-                                length="1"
-                                follows="left|top"
-                                height="12"
-                                layout="topleft"
-                                left_pad="8"
-                                top_delta="2"
-                                width="200"
-                                name="water_name">
+                           type="string"
+                           length="1"
+                           follows="left|top"
+                           height="12"
+                           layout="topleft"
+                           left_pad="8"
+                           top_delta="2"
+                           width="200"
+                           name="txt_water">
                             Water
                         </text>
-                    <line_editor
-                            follows="top|right"
-                            enabled="false"
-                            top_delta="-3"
-                            right="-5"
-                            xxxleft="-160"
-                            height="20"
-                            layout="topleft"
-                            name="edt_invname_water"
-                            width="155">
-                        Unknown
-                    </line_editor>
-                    <settings_drop_target
-                            height="20"
-                            top_delta="0"
-                            left_delta="0"
-                            follows="top|left"
-                            layout="topleft"
-                            name="sdt_water"
-                            tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
-                            width="155" />
-                        
+                        <line_editor
+                                follows="top|right"
+                                enabled="false"
+                                top_delta="-3"
+                                right="-5"
+                                xxxleft="-160"
+                                height="20"
+                                layout="topleft"
+                                name="edt_invname_water"
+                                width="155">
+                            Unknown
+                        </line_editor>
+                        <settings_drop_target
+                                height="20"
+                                top_delta="0"
+                                left_delta="0"
+                                follows="top|left"
+                                layout="topleft"
+                                name="sdt_water"
+                                tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
+                                width="155" />
+                    </panel>
+                    <panel
+                         follows="top|left"
+                         height="21"
+                         width="205"
+                         layout="topleft"
+                         visible="true"
+                         left="35"
+                         top="30"
+                         name="pnl_alt1">
                         <text
                                 type="string"
                                 length="1"
                                 follows="left"
                                 height="12"
                                 layout="topleft"
-                                left="35"
-                                top="30"
+                                top_pad="5"
+                                left_delta="0"
                                 width="200"
-                                name="alt1">
+                                name="txt_alt1">
                             Sky [INDEX]([ALTITUDE]m)
                         </text>
-                    <line_editor
-                            follows="top|right"
-                            enabled="false"
-                            top_delta="-3"
-                            right="-5"
-                            xxxleft="-160"
-                            height="20"
-                            layout="topleft"
-                            name="edt_invname_alt1"
-                            width="155">
-                        Unknown
-                    </line_editor>
-                    <settings_drop_target
-                            height="20"
-                            top_delta="0"
-                            left_delta="0"
-                            follows="top|left"
-                            layout="topleft"
-                            name="sdt_alt2"
-                            tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
-                            width="155" />
-                        
+                        <line_editor
+                                follows="top|right"
+                                enabled="false"
+                                top_delta="-3"
+                                right="-5"
+                                xxxleft="-160"
+                                height="20"
+                                layout="topleft"
+                                name="edt_invname_alt1"
+                                width="155">
+                            Unknown
+                        </line_editor>
+                        <settings_drop_target
+                                height="20"
+                                top_delta="0"
+                                left_delta="0"
+                                follows="top|left"
+                                layout="topleft"
+                                name="sdt_alt2"
+                                tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
+                                width="155" />
+                    </panel>
+                    <panel
+                         follows="top|left"
+                         height="21"
+                         width="205"
+                         layout="topleft"
+                         visible="true"
+                         left="35"
+                         top="50"
+                         name="pnl_alt2">
                         <text
                                 type="string"
                                 length="1"
                                 follows="left|top"
                                 height="12"
                                 layout="topleft"
-                                left="35"
-                                top="40"
+                                top_pad="5"
+                                left_delta="0"
                                 width="200"
-                                name="alt2">
+                                name="txt_alt2">
                             Sky [INDEX]([ALTITUDE]m)
                         </text>
-                    <line_editor
-                            follows="top|right"
-                            enabled="false"
-                            top_delta="-3"
-                            right="-5"
-                            xxxleft="-160"
-                            height="20"
-                            layout="topleft"
-                            name="edt_invname_alt2"
-                            width="155">
-                        Unknown
-                    </line_editor>
-                    <settings_drop_target
-                            height="20"
-                            top_delta="0"
-                            left_delta="0"
-                            follows="top|left"
-                            layout="topleft"
-                            name="sdt_alt2"
-                            tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
-                            width="155" />
-                        
+                        <line_editor
+                                follows="top|right"
+                                enabled="false"
+                                top_delta="-3"
+                                right="-5"
+                                xxxleft="-160"
+                                height="20"
+                                layout="topleft"
+                                name="edt_invname_alt2"
+                                width="155">
+                            Unknown
+                        </line_editor>
+                        <settings_drop_target
+                                height="20"
+                                top_delta="0"
+                                left_delta="0"
+                                follows="top|left"
+                                layout="topleft"
+                                name="sdt_alt2"
+                                tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
+                                width="155" />
+                    </panel>
+                    <panel
+                         follows="top|left"
+                         height="21"
+                         width="205"
+                         layout="topleft"
+                         visible="true"
+                         left="35"
+                         top="70"
+                         name="pnl_alt3">
                         <text
                                 type="string"
                                 length="1"
                                 follows="left|top"
                                 height="12"
                                 layout="topleft"
-                                left="35"
-                                top="50"
+                                top_pad="5"
+                                left_delta="0"
                                 width="200"
-                                name="alt3">
+                                name="txt_alt3">
                             Sky [INDEX]([ALTITUDE]m)
                         </text>
-                    <line_editor
-                            follows="top|right"
-                            enabled="false"
-                            top_delta="-3"
-                            right="-5"
-                            xxxleft="-160"
-                            height="20"
-                            layout="topleft"
-                            name="edt_invname_alt3"
-                            width="155">
-                        Unknown
-                    </line_editor>
-                    <settings_drop_target
-                            height="20"
-                            top_delta="0"
-                            left_delta="0"
-                            follows="top|left"
-                            layout="topleft"
-                            name="sdt_alt3"
-                            tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
-                            width="155" />
-                        
-                </layout_panel>                    
+                        <line_editor
+                                follows="top|right"
+                                enabled="false"
+                                top_delta="-3"
+                                right="-5"
+                                xxxleft="-160"
+                                height="20"
+                                layout="topleft"
+                                name="edt_invname_alt3"
+                                width="155">
+                            Unknown
+                        </line_editor>
+                        <settings_drop_target
+                                height="20"
+                                top_delta="0"
+                                left_delta="0"
+                                follows="top|left"
+                                layout="topleft"
+                                name="sdt_alt3"
+                                tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
+                                width="155" />
+                    </panel>
+                </layout_panel>
                 <layout_panel
                         auto_resize="true"
                         user_resize="false"
-- 
cgit v1.2.3


From 64e45b5b6ef8ded7bbea1b376e5bf2cbb0d6f5a4 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 4 Jan 2019 17:10:28 -0800
Subject: SL-10041, SL-9758: Environment tab is disabled(shows can't do this)
 when EM does not allow parcel override. "Commit" button now reads "Apply to
 Parcel" or "Apply to Region" as needed.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index a3dbab2509..a6868d7f90 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -24,6 +24,9 @@
     <string name="sky_label">Sky</string>
     <string name="water_label">Water</string>
 
+    <string name="commit_parcel">Apply To Parcel</string>
+    <string name="commit_region">Apply To Region</string>
+    
     <!-- Layout -->
     <layout_stack name="outer_stack"
             width="705"
-- 
cgit v1.2.3


From 1badfb0e96959725fbe2895994607a088f4a808b Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 7 Jan 2019 10:24:55 -0800
Subject: SL-9883: Hide controls and display message if parcel < 128m

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

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

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 7b4164268f..eac444c971 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -17,6 +17,7 @@
     <string name="str_cross_region">Environmental settings are not available across region boundries.</string>
     <string name="str_legacy">Environmental settings are not available on this region.</string>
     <string name="str_disallowed">The estate manager does not allow changing parcel environments in this region.</string>
+    <string name="str_too_small">The parcel must be at least 128 square meeters to support an environment.</string>
     <string name="str_empty">(empty)</string>
     <layout_stack 
             width="530"
-- 
cgit v1.2.3


From 89abadaf2f8a4ea76bfe6433d6f3426ca41963dc Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 8 Jan 2019 18:38:16 +0200
Subject: SL-10280 Added label repositioning code to display percentage in
 correct places.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index a6868d7f90..1aea1391d8 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -191,7 +191,7 @@
                                 follows="left|top|right"
                                 height="15"
                                 layout="topleft"
-                                left_pad="39"
+                                left_pad="37"
                                 name="p1"
                                 top_delta="0"
                                 value="25%[DSC]"
@@ -200,7 +200,7 @@
                                 follows="left|top|right"
                                 height="15"
                                 layout="topleft"
-                                left_pad="39"
+                                left_pad="42"
                                 name="p2"
                                 top_delta="0"
                                 value="50%[DSC]"
@@ -209,7 +209,7 @@
                                 follows="left|top|right"
                                 height="15"
                                 layout="topleft"
-                                left_pad="39"
+                                left_pad="42"
                                 name="p3"
                                 top_delta="0"
                                 value="75%[DSC]"
@@ -218,7 +218,7 @@
                                 follows="left|top|right"
                                 height="15"
                                 layout="topleft"
-                                left_pad="39"
+                                left_pad="42"
                                 name="p4"
                                 top_delta="0"
                                 value="100%[DSC]"
-- 
cgit v1.2.3


From ac85669c67be03bfb77f81e9bf51e7f1d4d6ee78 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 8 Jan 2019 19:54:59 +0200
Subject: SL-10060 EEP Add reset default sky altitudes functionality

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

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

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 eac444c971..a39973fe3a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -203,6 +203,16 @@
                                 tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
                                 width="155" />
                     </panel>
+                    <button
+                            follows="top|left"
+                            layout="topleft"
+                            height="23"
+                            width="100"
+                            label="Reset"
+                            left_pad="-90"
+                            top_pad="4"
+                            tool_tip="Reset to default altitudes"
+                            name="btn_rst_altitudes" />
                     <panel
                          follows="top|left"
                          height="21"
-- 
cgit v1.2.3


From c302e4ee967c5ceb2aff95e207a5f3fb8ac0ebb2 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 8 Jan 2019 15:04:10 -0800
Subject: SL-10268, SL-10323: Use _script_perm to display sit and change env
 questions. Exp log messages for environment changes."

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 10e98719a4..1879ce6f32 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4219,6 +4219,8 @@ Try enclosing path to the editor with double quotes.
   <string name="ExperiencePermission10">control your camera</string>
   <string name="ExperiencePermission11">teleport you</string>
   <string name="ExperiencePermission12">automatically accept experience permissions</string>
+  <string name="ExperiencePermission16">force your avatar to sit</string>
+  <string name="ExperiencePermission17">change your environment settings</string>
   <string name="ExperiencePermissionShortUnknown">perform an unknown operation: [Permission]</string>
   <string name="ExperiencePermissionShort1">Take Controls</string>
   <string name="ExperiencePermissionShort3">Trigger Animations</string>
@@ -4227,6 +4229,8 @@ Try enclosing path to the editor with double quotes.
   <string name="ExperiencePermissionShort10">Control Camera</string>
   <string name="ExperiencePermissionShort11">Teleport</string>
   <string name="ExperiencePermissionShort12">Permission</string>
+  <string name="ExperiencePermissionShort16">Sit</string>
+  <string name="ExperiencePermissionShort17">Environment</string>
 
   <!-- Conversation log messages -->
   <string name="logging_calls_disabled_log_empty">
-- 
cgit v1.2.3


From 13c537e9a0f05857f89085b91ac098921c317fb1 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 9 Jan 2019 21:57:12 +0200
Subject: SL-10279 Readjusting altitude slider

---
 .../default/xui/en/panel_region_environment.xml    | 651 +++++++++++----------
 1 file changed, 346 insertions(+), 305 deletions(-)

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

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 a39973fe3a..ed344f2a14 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -2,7 +2,7 @@
 
 <panel
         border="true"
-        follows="top|left"
+        follows="all"
         height="375"
         label="Environment"
         layout="topleft"
@@ -22,6 +22,7 @@
     <layout_stack 
             width="530"
             height="367"
+                auto_resize="true"
             follows="all"
             layout="topleft"
             animate="false"
@@ -57,297 +58,7 @@
                         auto_resize="true"
                         user_resize="false"
                         min_height="0"
-                        top="5"
-                        name="pnl_environment_altitudes"
-                        visible="true">
-                        <text follows="top|left"
-                                font="SansSerif"
-                                halign="left"
-                                text_color="white"
-                                left="5"
-                                top="2">Sky Altitudes</text>
-                    <multi_slider
-                            height="270"
-                            follows="top|left"
-                            orientation="vertical"
-                            increment="25"
-                            min_val="100"
-                            max_val="4000"
-                            thumb_image="Inv_SettingsSky"
-                            thumb_width="17"
-                            thumb_highlight_color="white"
-                            decimal_digits="0"
-                            draw_track="true"
-                            overlap_threshold="100"
-                            initial_value="0"
-                            layout="topleft"
-                            left="10"
-                            max_sliders="3"
-                            name="sld_altitudes"
-                            show_text="false"
-                            top_pad="20"
-                            use_triangle="false"
-                            width="17">
-                        <slider name="sld1"
-                                value="1000"/>
-                        <slider name="sld2"
-                                value="2000"/>
-                        <slider name="sld3"
-                                value="3000"/>
-                    </multi_slider>
-                    <panel
-                        follows="top|left"
-                        height="21"
-                        width="222"
-                        layout="topleft"
-                        visible="true"
-                        left="10"
-                        top_pad="10"
-                        name="pnl_ground">
-                        <icon
-                            follows="top|left"
-                            height="17"
-                            width="17"
-                            image_name="Inv_SettingsSky"
-                            layout="topleft"
-                            name="icon_ground"
-                            mouse_opaque="false"
-                            visible="true"
-                            top_pad="2"
-                            left_delta="0"/>
-                        <text
-                           type="string"
-                           length="1"
-                           follows="left|top"
-                           height="12"
-                           layout="topleft"
-                           left_pad="8"
-                           top_delta="2"
-                           width="50"
-                           name="txt_ground">
-                            Ground
-                        </text>
-                        <line_editor
-                           follows="top|right"
-                           enabled="false"
-                           top_delta="-3"
-                           right="-5"
-                           xxxleft="-160"
-                           height="20"
-                           layout="topleft"
-                           name="edt_invname_ground"
-                           width="155">
-                            Unknown
-                        </line_editor>
-                        <settings_drop_target
-                           height="20"
-                           top_delta="0"
-                           left_delta="0"
-                           follows="top|left"
-                           layout="topleft"
-                           name="sdt_ground"
-                           tool_tip="Drag a setting from Inventory onto this target box to select it as the ground level sky."
-                           width="155" />
-                    </panel>
-                    <panel
-                         follows="top|left"
-                         height="21"
-                         width="222"
-                         layout="topleft"
-                         visible="true"
-                         left="10"
-                         top_pad="10"
-                         name="pnl_water">
-                        <icon
-                           follows="left|top"
-                           height="17"
-                           width="17"
-                           image_name="Inv_SettingsWater"
-                           layout="topleft"
-                           name="icon_water"
-                           mouse_opaque="false"
-                           visible="true"
-                           top_pad="2"
-                           left_delta="0"/>
-                        <text
-                           type="string"
-                           length="1"
-                           follows="left|top"
-                           height="12"
-                           layout="topleft"
-                           left_pad="8"
-                           top_delta="2"
-                           width="200"
-                           name="txt_water">
-                            Water
-                        </text>
-                        <line_editor
-                                follows="top|right"
-                                enabled="false"
-                                top_delta="-3"
-                                right="-5"
-                                xxxleft="-160"
-                                height="20"
-                                layout="topleft"
-                                name="edt_invname_water"
-                                width="155">
-                            Unknown
-                        </line_editor>
-                        <settings_drop_target
-                                height="20"
-                                top_delta="0"
-                                left_delta="0"
-                                follows="top|left"
-                                layout="topleft"
-                                name="sdt_water"
-                                tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
-                                width="155" />
-                    </panel>
-                    <button
-                            follows="top|left"
-                            layout="topleft"
-                            height="23"
-                            width="100"
-                            label="Reset"
-                            left_pad="-90"
-                            top_pad="4"
-                            tool_tip="Reset to default altitudes"
-                            name="btn_rst_altitudes" />
-                    <panel
-                         follows="top|left"
-                         height="21"
-                         width="205"
-                         layout="topleft"
-                         visible="true"
-                         left="35"
-                         top="30"
-                         name="pnl_alt1">
-                        <text
-                                type="string"
-                                length="1"
-                                follows="left"
-                                height="12"
-                                layout="topleft"
-                                top_pad="5"
-                                left_delta="0"
-                                width="200"
-                                name="txt_alt1">
-                            Sky [INDEX]([ALTITUDE]m)
-                        </text>
-                        <line_editor
-                                follows="top|right"
-                                enabled="false"
-                                top_delta="-3"
-                                right="-5"
-                                xxxleft="-160"
-                                height="20"
-                                layout="topleft"
-                                name="edt_invname_alt1"
-                                width="155">
-                            Unknown
-                        </line_editor>
-                        <settings_drop_target
-                                height="20"
-                                top_delta="0"
-                                left_delta="0"
-                                follows="top|left"
-                                layout="topleft"
-                                name="sdt_alt2"
-                                tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
-                                width="155" />
-                    </panel>
-                    <panel
-                         follows="top|left"
-                         height="21"
-                         width="205"
-                         layout="topleft"
-                         visible="true"
-                         left="35"
-                         top="50"
-                         name="pnl_alt2">
-                        <text
-                                type="string"
-                                length="1"
-                                follows="left|top"
-                                height="12"
-                                layout="topleft"
-                                top_pad="5"
-                                left_delta="0"
-                                width="200"
-                                name="txt_alt2">
-                            Sky [INDEX]([ALTITUDE]m)
-                        </text>
-                        <line_editor
-                                follows="top|right"
-                                enabled="false"
-                                top_delta="-3"
-                                right="-5"
-                                xxxleft="-160"
-                                height="20"
-                                layout="topleft"
-                                name="edt_invname_alt2"
-                                width="155">
-                            Unknown
-                        </line_editor>
-                        <settings_drop_target
-                                height="20"
-                                top_delta="0"
-                                left_delta="0"
-                                follows="top|left"
-                                layout="topleft"
-                                name="sdt_alt2"
-                                tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
-                                width="155" />
-                    </panel>
-                    <panel
-                         follows="top|left"
-                         height="21"
-                         width="205"
-                         layout="topleft"
-                         visible="true"
-                         left="35"
-                         top="70"
-                         name="pnl_alt3">
-                        <text
-                                type="string"
-                                length="1"
-                                follows="left|top"
-                                height="12"
-                                layout="topleft"
-                                top_pad="5"
-                                left_delta="0"
-                                width="200"
-                                name="txt_alt3">
-                            Sky [INDEX]([ALTITUDE]m)
-                        </text>
-                        <line_editor
-                                follows="top|right"
-                                enabled="false"
-                                top_delta="-3"
-                                right="-5"
-                                xxxleft="-160"
-                                height="20"
-                                layout="topleft"
-                                name="edt_invname_alt3"
-                                width="155">
-                            Unknown
-                        </line_editor>
-                        <settings_drop_target
-                                height="20"
-                                top_delta="0"
-                                left_delta="0"
-                                follows="top|left"
-                                layout="topleft"
-                                name="sdt_alt3"
-                                tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
-                                width="155" />
-                    </panel>
-                </layout_panel>
-                <layout_panel
-                        auto_resize="true"
-                        user_resize="false"
-                        min_height="0"
-                        top="5"
+                        top="0"
                         name="pnl_environment_config"
                         visible="true">
                     <layout_stack
@@ -365,6 +76,7 @@
                                     font="SansSerif"
                                     halign="left"
                                     text_color="white"
+                                    left="5"
                                     top="2">Select Environment</text>
                             <button
                                     follows="top|left"
@@ -413,6 +125,7 @@
                                     follows="top|left|right"
                                     halign="left"
                                     text_color="white"
+                                    left="5"
                                     top="2">Day Settings</text>
                             <text
                                     type="string"
@@ -427,19 +140,20 @@
                             </text>
                             <slider
                                     can_edit_text="true"
+                                    auto_resize="true"
                                     decimal_digits="1"
-                                    follows="left|top"
-                                    height="20"
-                                    increment="0.5"
-                                    initial_value="4"
+                                    follows="top|left|right"
                                     layout="topleft"
-                                    left_delta="0"
-                                    xxxright="-10"
+                                    increment="0.5"
+                                    height="20"
+                                    width="237"
+                                    left="10"
                                     top_pad="0"
+                                    right="-10"
+                                    initial_value="4"
                                     name="sld_day_length"
                                     min_val="4"
-                                    max_val="168"
-                                    width="237" />
+                                    max_val="168" />
                             <text
                                     type="string"
                                     length="1"
@@ -454,17 +168,18 @@
                             <slider
                                     can_edit_text="true"
                                     decimal_digits="1"
-                                    follows="left|top"
+                                    follows="top|left|right"
+                                    layout="topleft"
                                     height="20"
+                                    width="237"
                                     increment="0.5"
                                     initial_value="-8"
-                                    layout="topleft"
-                                    left_delta="0"
+                                    left="10"
                                     top_pad="0"
+                                    right="-10"
                                     name="sld_day_offset"
                                     min_val="-11.5"
-                                    max_val="12"
-                                    width="237" />
+                                    max_val="12" />
                             <text
                                     type="string"
                                     length="1"
@@ -499,6 +214,332 @@
                         </layout_panel>
                     </layout_stack>
                 </layout_panel>
+                <layout_panel
+                        auto_resize="true"
+                        user_resize="false"
+                        min_height="0"
+                        top="0"
+                        name="pnl_environment_altitudes"
+                        visible="true">
+                    <!-- Three movable panels first so that they will be 'below' slider-->
+                    <panel
+                         follows="top|left"
+                         height="26"
+                         width="360"
+                         layout="topleft"
+                         visible="true"
+                         left="1"
+                         top="30"
+                         name="pnl_alt1">
+                        <text
+                                type="string"
+                                length="1"
+                                follows="left|top"
+                                layout="topleft"
+                                height="24"
+                                width="52"
+                                left_delta="2"
+                                top_pad="1"
+                                halign="right"
+                                name="txt_alt1">
+                            Sky [INDEX]
+                            [ALTITUDE]m
+                        </text>
+                        <line_editor
+                                follows="left|top"
+                                enabled="false"
+                                top_delta="3"
+                                left_pad="21"
+                                xxxleft="-160"
+                                height="20"
+                                layout="topleft"
+                                name="edt_invname_alt1"
+                                width="155">
+                            Unknown
+                        </line_editor>
+                        <settings_drop_target
+                                height="20"
+                                top_delta="0"
+                                left_delta="0"
+                                follows="top|left"
+                                layout="topleft"
+                                name="sdt_alt2"
+                                tool_tip="Drag a setting from Inventory onto this target box to select it as current sky."
+                                width="155" />
+                    </panel>
+                    <panel
+                         follows="top|left"
+                         height="26"
+                         width="360"
+                         layout="topleft"
+                         visible="true"
+                         left="1"
+                         top="60"
+                         name="pnl_alt2">
+                        <text
+                                type="string"
+                                length="1"
+                                follows="left|top"
+                                layout="topleft"
+                                height="24"
+                                width="52"
+                                left_delta="2"
+                                top_pad="1"
+                                halign="right"
+                                name="txt_alt2">
+                            Sky [INDEX]
+                            [ALTITUDE]m
+                        </text>
+                        <line_editor
+                                follows="left|top"
+                                enabled="false"
+                                top_delta="3"
+                                left_pad="21"
+                                xxxleft="-160"
+                                height="20"
+                                layout="topleft"
+                                name="edt_invname_alt2"
+                                width="155">
+                            Unknown
+                        </line_editor>
+                        <settings_drop_target
+                                height="20"
+                                top_delta="0"
+                                left_delta="0"
+                                follows="top|left"
+                                layout="topleft"
+                                name="sdt_alt2"
+                                tool_tip="Drag a setting from Inventory onto this target box to select it as current sky."
+                                width="155" />
+                    </panel>
+                    <panel
+                         follows="top|left"
+                         height="26"
+                         width="360"
+                         layout="topleft"
+                         visible="true"
+                         left="1"
+                         top="90"
+                         name="pnl_alt3">
+                        <text
+                                type="string"
+                                length="1"
+                                follows="left|top"
+                                layout="topleft"
+                                height="25"
+                                width="52"
+                                left_delta="2"
+                                top_pad="1"
+                                halign="right"
+                                name="txt_alt3">
+                            Sky [INDEX]
+                            [ALTITUDE]m
+                        </text>
+                        <line_editor
+                                follows="left|top"
+                                enabled="false"
+                                top_delta="3"
+                                left_pad="21"
+                                xxxleft="-160"
+                                height="20"
+                                layout="topleft"
+                                name="edt_invname_alt3"
+                                width="155">
+                            Unknown
+                        </line_editor>
+                        <settings_drop_target
+                                height="20"
+                                top_delta="0"
+                                left_delta="0"
+                                follows="top|left"
+                                layout="topleft"
+                                name="sdt_alt3"
+                                tool_tip="Drag a setting from Inventory onto this target box to select it as current sky."
+                                width="155" />
+                    </panel>
+                    <text follows="top|left"
+                                font="SansSerif"
+                                halign="left"
+                                text_color="white"
+                                left="5"
+                                top="2">Sky Altitudes</text>
+                    <!-- Divider icons also should be under slider to not interfer with clicks-->
+                    <icon
+                        color="LtGray"
+                        height="2"
+                        width="17"
+                        image_name="Rounded_Square"
+                        layout="topleft"
+                        left="57"
+                        top="89"
+                        name="mark0"/>
+                    <icon
+                        color="LtGray"
+                        height="2"
+                        width="17"
+                        image_name="Rounded_Square"
+                        layout="topleft"
+                        left_delta="0"
+                        top_delta="69"
+                        name="mark1"/>
+                    <icon
+                        color="LtGray"
+                        height="2"
+                        width="17"
+                        image_name="Rounded_Square"
+                        layout="topleft"
+                        left_delta="0"
+                        top_delta="69"
+                        name="mark2"/>
+                    <multi_slider
+                            height="270"
+                            follows="top|left"
+                            orientation="vertical"
+                            increment="25"
+                            min_val="100"
+                            max_val="4000"
+                            thumb_image="Inv_SettingsSky"
+                            thumb_width="17"
+                            thumb_highlight_color="white"
+                            decimal_digits="0"
+                            draw_track="true"
+                            overlap_threshold="100"
+                            initial_value="0"
+                            layout="topleft"
+                            left="57"
+                            max_sliders="3"
+                            name="sld_altitudes"
+                            show_text="false"
+                            top="20"
+                            use_triangle="false"
+                            width="17">
+                        <slider name="sld1"
+                                value="1000"/>
+                        <slider name="sld2"
+                                value="2000"/>
+                        <slider name="sld3"
+                                value="3000"/>
+                    </multi_slider>
+                    <panel
+                        follows="top|left"
+                        height="21"
+                        width="360"
+                        layout="topleft"
+                        visible="true"
+                        left="1"
+                        top_pad="10"
+                        name="pnl_ground">
+                        <text
+                           type="string"
+                           length="1"
+                           follows="left|top"
+                           layout="topleft"
+                           height="12"
+                           width="52"
+                           left_delta="2"
+                           top_pad="2"
+                           halign="right"
+                           name="txt_ground">
+                            Ground
+                        </text>
+                        <icon
+                            follows="top|left"
+                            height="17"
+                            width="17"
+                            image_name="Inv_SettingsSky"
+                            layout="topleft"
+                            name="icon_ground"
+                            mouse_opaque="false"
+                            visible="true"
+                           top_delta="-3"
+                           left_pad="2"/>
+                        <line_editor
+                           follows="left|top"
+                           enabled="false"
+                           top_delta="-1"
+                           left_pad="2"
+                           xxxleft="-160"
+                           height="20"
+                           layout="topleft"
+                           name="edt_invname_ground"
+                           width="155">
+                            Unknown
+                        </line_editor>
+                        <settings_drop_target
+                           height="20"
+                           top_delta="0"
+                           left_delta="0"
+                           follows="top|left"
+                           layout="topleft"
+                           name="sdt_ground"
+                           tool_tip="Drag a setting from Inventory onto this target box to select it as the ground level sky."
+                           width="155" />
+                    </panel>
+                    <panel
+                         follows="top|left"
+                         height="21"
+                         width="360"
+                         layout="topleft"
+                         visible="true"
+                         left="1"
+                         top_pad="10"
+                         name="pnl_water">
+                        <text
+                           type="string"
+                           length="1"
+                           follows="left|top"
+                           layout="topleft"
+                           height="12"
+                           width="52"
+                           left_delta="2"
+                           top_pad="2"
+                           halign="right"
+                           name="txt_water">
+                            Water
+                        </text>
+                        <icon
+                           follows="left|top"
+                           height="17"
+                           width="17"
+                           image_name="Inv_SettingsWater"
+                           layout="topleft"
+                           name="icon_water"
+                           mouse_opaque="false"
+                           visible="true"
+                           top_delta="-3"
+                           left_pad="2"/>
+                        <line_editor
+                                follows="left|top"
+                                enabled="false"
+                                top_delta="-1"
+                                left_pad="2"
+                                height="20"
+                                layout="topleft"
+                                name="edt_invname_water"
+                                width="155">
+                            Unknown
+                        </line_editor>
+                        <settings_drop_target
+                                height="20"
+                                top_delta="0"
+                                left_delta="0"
+                                follows="top|left"
+                                layout="topleft"
+                                name="sdt_water"
+                                tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
+                                width="155" />
+                    </panel>
+                    <button
+                            follows="top|right"
+                            layout="topleft"
+                            height="23"
+                            width="100"
+                            label="Reset"
+                            right="-10"
+                            top_pad="4"
+                            tool_tip="Reset to default altitudes"
+                            name="btn_rst_altitudes" />
+                </layout_panel>
             </layout_stack>        
         </layout_panel>
         <!--
-- 
cgit v1.2.3


From 00d8caa359a216620db46d49696bc79a95fe8dc2 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 10 Jan 2019 22:11:11 +0200
Subject: SL-10279 Finalize drag and drop support

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

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

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 ed344f2a14..0c0ca2ac60 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -263,7 +263,7 @@
                                 left_delta="0"
                                 follows="top|left"
                                 layout="topleft"
-                                name="sdt_alt2"
+                                name="sdt_alt1"
                                 tool_tip="Drag a setting from Inventory onto this target box to select it as current sky."
                                 width="155" />
                     </panel>
-- 
cgit v1.2.3


From 506c3b072afbe0e076279e8cb38b514458882f47 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 11 Jan 2019 16:29:25 -0800
Subject: SL-10350: If the item is now owned by the current user assume it is
 in the libary.  Don't let them edit.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b4cfe9d1b5..9ca9d4cd51 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11322,4 +11322,14 @@ Are you sure you want to continue?
      yestext="Yes"/>
   </notification>
   
+  <notification
+   icon="notify.tga"
+   name="NoEditFromLibrary"
+   persist="true"
+   type="alertmodal">
+You may not edit settings directly from the libary.  
+Please copy to your own inventory and try again.
+  <tag>fail</tag>
+  </notification>
+
 </notifications>
-- 
cgit v1.2.3


From 4aa6506b746a287675b2f418c0bdc32f87ea8d3c Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 15 Jan 2019 11:53:53 +0200
Subject: SL-10362 fixed typo in the message

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

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

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 0c0ca2ac60..32b6e56acd 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -17,7 +17,7 @@
     <string name="str_cross_region">Environmental settings are not available across region boundries.</string>
     <string name="str_legacy">Environmental settings are not available on this region.</string>
     <string name="str_disallowed">The estate manager does not allow changing parcel environments in this region.</string>
-    <string name="str_too_small">The parcel must be at least 128 square meeters to support an environment.</string>
+    <string name="str_too_small">The parcel must be at least 128 square meters to support an environment.</string>
     <string name="str_empty">(empty)</string>
     <layout_stack 
             width="530"
-- 
cgit v1.2.3


From a712b96919a4f695c59d5c3eece1dd20e7eed9f3 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 15 Jan 2019 13:04:29 +0200
Subject: SL-10361 fixed overlapping of water setting sliders

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 55d104f7b2..88d0f7827b 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -62,7 +62,7 @@
             </text>
             <slider
                     decimal_digits="1"
-                    follows="left|top|right"
+                    follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
@@ -83,7 +83,7 @@
                 Underwater Modifier:</text>
             <slider
                     decimal_digits="1"
-                    follows="left|top|right"
+                    follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
@@ -127,7 +127,7 @@
                     </text>
                     <slider
                             decimal_digits="2"
-                            follows="left|top|right"
+                            follows="left|top"
                             increment="0.01"
                             initial_value="0.7"
                             height="16"
-- 
cgit v1.2.3


From 042454bda9506185ebf82e3bbdf4305214d6af84 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 16 Jan 2019 14:05:02 -0800
Subject: Add Copy/Load/Clear track buttons.  Clear track functionality.

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  | 345 ++++++++++++---------
 1 file changed, 204 insertions(+), 141 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 1aea1391d8..284b30da6c 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -26,7 +26,7 @@
 
     <string name="commit_parcel">Apply To Parcel</string>
     <string name="commit_region">Apply To Region</string>
-    
+
     <!-- Layout -->
     <layout_stack name="outer_stack"
             width="705"
@@ -270,162 +270,225 @@
                                 width="70" />
 
                         <layout_stack
-                                name="progress_control"
-                                follows="top|left"
-                                height="25"
-                                width="83"
-                                layout="topleft"
+                                follows="all"
+                                height="200"
                                 animate="false"
-                                left="225"
-                                top_pad="40"
+                                top_pad="5"
+                                left="0"
                                 orientation="horizontal">
-
                             <layout_panel
-                                    name="skip_back"
-                                    mouse_opaque="false"
+                                    border="false"
+                                    bevel_style="in"
                                     auto_resize="false"
-                                    layout="topleft"
-                                    top="0"
-                                    height="25"
-                                    min_width="25"
-                                    width="25">
+                                    user_resize="false"
+                                    height="150"
+                                    width="200"
+                                    min_height="0"
+                                    visible="true">
                                 <button
-                                        name="skip_back_btn"
-                                        follows="top"
-                                        image_overlay="SkipBackward_Off"
-                                        image_disabled="PushButton_Disabled"
-                                        image_disabled_selected="PushButton_Disabled"
-                                        image_selected="PushButton_Selected"
-                                        image_unselected="PushButton_Off"
-                                        hover_glow_amount="0.15"
-                                        auto_resize="false"
-                                        width="25"
-                                        height="25"
-                                        layout="topleft"
-                                        tool_tip="Step back"
-                                        top="0"
-                                        left="0">
-                                    <button.commit_callback
-                                            function="DayCycle.PlayActions"
-                                            parameter="back" />
-                                </button>
+                                        follows="top|left"
+                                        height="23"
+                                        width="90"
+                                        label="Clone From"
+                                        left="10"
+                                        top_pad="10"
+                                        name="copy_track" />
+                                <button
+                                        follows="top|left"
+                                        height="23"
+                                        width="90"
+                                        label="Load From"
+                                        top_pad="0"
+                                        left_delta="0"
+                                        name="load_track" />
+                                <button
+                                        follows="top|left"
+                                        height="23"
+                                        width="90"
+                                        label="Clear"
+                                        top_pad="0"
+                                        left_delta="0"
+                                        name="clear_track" />
+                                    
                             </layout_panel>
-
                             <layout_panel
-                                    name="play_layout"
-                                    mouse_opaque="false"
+                                    border="false"
+                                    bevel_style="in"
                                     auto_resize="false"
-                                    layout="topleft"
-                                    top="0"
-                                    height="25"
-                                    min_width="25"
-                                    width="25">
-                                <button
-                                        name="play_btn"
-                                        follows="top"
-                                        image_overlay="Play_Off"
-                                        image_disabled="PushButton_Disabled"
-                                        image_disabled_selected="PushButton_Disabled"
-                                        image_selected="PushButton_Selected"
-                                        image_unselected="PushButton_Off"
-                                        hover_glow_amount="0.15"
-                                        auto_resize="false"
-                                        layout="topleft"
+                                    user_resize="false"
+                                    height="150"
+                                    width="200"
+                                    min_height="0"
+                                    visible="true">
+                                <layout_stack
+                                        name="progress_control"
+                                        follows="top|left"
                                         height="25"
-                                        width="25"
-                                        left="0"
-                                        top="0">
-                                    <button.commit_callback
-                                            function="DayCycle.PlayActions"
-                                            parameter="play" />
-                                </button>
-                            </layout_panel>
+                                        width="83"
+                                        layout="topleft"
+                                        animate="false"
+                                        left="31"
+                                        top="40"
+                                        orientation="horizontal">
+
+                                    <layout_panel
+                                            name="skip_back"
+                                            mouse_opaque="false"
+                                            auto_resize="false"
+                                            layout="topleft"
+                                            top="0"
+                                            height="25"
+                                            min_width="25"
+                                            width="25">
+                                        <button
+                                                name="skip_back_btn"
+                                                follows="top"
+                                                image_overlay="SkipBackward_Off"
+                                                image_disabled="PushButton_Disabled"
+                                                image_disabled_selected="PushButton_Disabled"
+                                                image_selected="PushButton_Selected"
+                                                image_unselected="PushButton_Off"
+                                                hover_glow_amount="0.15"
+                                                auto_resize="false"
+                                                width="25"
+                                                height="25"
+                                                layout="topleft"
+                                                tool_tip="Step back"
+                                                top="0"
+                                                left="0">
+                                            <button.commit_callback
+                                                    function="DayCycle.PlayActions"
+                                                    parameter="back" />
+                                        </button>
+                                    </layout_panel>
+
+                                    <layout_panel
+                                            name="play_layout"
+                                            mouse_opaque="false"
+                                            auto_resize="false"
+                                            layout="topleft"
+                                            top="0"
+                                            height="25"
+                                            min_width="25"
+                                            width="25">
+                                        <button
+                                                name="play_btn"
+                                                follows="top"
+                                                image_overlay="Play_Off"
+                                                image_disabled="PushButton_Disabled"
+                                                image_disabled_selected="PushButton_Disabled"
+                                                image_selected="PushButton_Selected"
+                                                image_unselected="PushButton_Off"
+                                                hover_glow_amount="0.15"
+                                                auto_resize="false"
+                                                layout="topleft"
+                                                height="25"
+                                                width="25"
+                                                left="0"
+                                                top="0">
+                                            <button.commit_callback
+                                                    function="DayCycle.PlayActions"
+                                                    parameter="play" />
+                                        </button>
+                                    </layout_panel>
 
+                                    <layout_panel
+                                            name="pause_layout"
+                                            mouse_opaque="false"
+                                            auto_resize="false"
+                                            layout="topleft"
+                                            top="0"
+                                            height="25"
+                                            min_width="25"
+                                            width="25"
+                                            visible="false">
+                                        <button
+                                                name="pause_btn"
+                                                follows="top"
+                                                image_overlay="Pause_Off"
+                                                image_disabled="PushButton_Disabled"
+                                                image_disabled_selected="PushButton_Disabled"
+                                                image_selected="PushButton_Selected"
+                                                image_unselected="PushButton_Off"
+                                                hover_glow_amount="0.15"
+                                                auto_resize="false"
+                                                layout="topleft"
+                                                height="25"
+                                                width="25"
+                                                left="0"
+                                                top="0">
+                                            <button.commit_callback
+                                                    function="DayCycle.PlayActions"
+                                                    parameter="pause" />
+                                        </button>
+                                    </layout_panel>
+
+                                    <layout_panel
+                                            name="skip_forward"
+                                            mouse_opaque="false"
+                                            auto_resize="false"
+                                            layout="topleft"
+                                            top="0"
+                                            height="25"
+                                            min_width="25"
+                                            width="25">
+                                        <button
+                                                name="skip_forward_btn"
+                                                follows="top"
+                                                image_overlay="SkipForward_Off"
+                                                image_disabled="PushButton_Disabled"
+                                                image_disabled_selected="PushButton_Disabled"
+                                                image_selected="PushButton_Selected"
+                                                image_unselected="PushButton_Off"
+                                                hover_glow_amount="0.15"
+                                                width="25"
+                                                height="25"
+                                                layout="topleft"
+                                                tool_tip="Step forward"
+                                                top="0">
+                                            <button.commit_callback
+                                                    function="DayCycle.PlayActions"
+                                                    parameter="forward" />
+                                        </button>
+                                    </layout_panel>
+                                </layout_stack>
+                            </layout_panel>
                             <layout_panel
-                                    name="pause_layout"
-                                    mouse_opaque="false"
+                                    border="false"
+                                    bevel_style="in"
                                     auto_resize="false"
-                                    layout="topleft"
-                                    top="0"
-                                    height="25"
-                                    min_width="25"
-                                    width="25"
-                                    visible="false">
+                                    user_resize="false"
+                                    width="190"
+                                    height="150"
+                                    min_height="0"
+                                    visible="true">
                                 <button
-                                        name="pause_btn"
-                                        follows="top"
-                                        image_overlay="Pause_Off"
-                                        image_disabled="PushButton_Disabled"
-                                        image_disabled_selected="PushButton_Disabled"
-                                        image_selected="PushButton_Selected"
-                                        image_unselected="PushButton_Off"
-                                        hover_glow_amount="0.15"
-                                        auto_resize="false"
-                                        layout="topleft"
-                                        height="25"
-                                        width="25"
-                                        left="0"
-                                        top="0">
-                                    <button.commit_callback
-                                            function="DayCycle.PlayActions"
-                                            parameter="pause" />
-                                </button>
-                            </layout_panel>
 
-                            <layout_panel
-                                    name="skip_forward"
-                                    mouse_opaque="false"
-                                    auto_resize="false"
-                                    layout="topleft"
-                                    top="0"
-                                    height="25"
-                                    min_width="25"
-                                    width="25">
+                                        follows="top|right"
+                                        height="23"
+                                        width="90"
+                                        right="-10"
+                                        top_pad="10"
+                                        label="Add [FRAME]"
+                                        name="add_frame" />
                                 <button
-                                        name="skip_forward_btn"
-                                        follows="top"
-                                        image_overlay="SkipForward_Off"
-                                        image_disabled="PushButton_Disabled"
-                                        image_disabled_selected="PushButton_Disabled"
-                                        image_selected="PushButton_Selected"
-                                        image_unselected="PushButton_Off"
-                                        hover_glow_amount="0.15"
-                                        width="25"
-                                        height="25"
-                                        layout="topleft"
-                                        tool_tip="Step forward"
-                                        top="0">
-                                    <button.commit_callback
-                                            function="DayCycle.PlayActions"
-                                            parameter="forward" />
-                                </button>
+                                        follows="top|left"
+                                        height="23"
+                                        width="90"
+                                        label="Load [FRAME]"
+                                        top_pad="0"
+                                        left_delta="0"
+                                        name="btn_load_frame" />
+                                <button
+                                        follows="left|top"
+                                        height="23"
+                                        width="90"
+                                        label="Delete [FRAME]"
+                                        top_pad="0"
+                                        left_delta="0"
+                                        name="delete_frame" />
                             </layout_panel>
                         </layout_stack>
-
-                        <button
-                                follows="top|left"
-                                height="23"
-                                width="90"
-                                label="Add [FRAME]"
-                                left_pad="175"
-                                top_delta="-20"
-                                name="add_frame" />
-                        <button
-                                follows="top|left"
-                                height="23"
-                                width="90"
-                                label="Load [FRAME]"
-                                top_pad="0"
-                                left_delta="0"
-                                name="btn_load_frame" />
-                        <button
-                                follows="left|top"
-                                height="23"
-                                width="90"
-                                label="Delete [FRAME]"
-                                top_pad="0"
-                                left_delta="0"
-                                name="delete_frame" />
                     </panel>
                 </layout_panel>
                 <layout_panel name="frame_edit_controls"
@@ -447,7 +510,7 @@
                             font="SansSerif"
                             text_color="Yellow"
                             width="500">
-Select a key frame from the timeline above to edit settings.
+                        Select a key frame from the timeline above to edit settings.
                     </text>
                 </layout_panel>
                 <layout_panel name="frame_settings_water"
-- 
cgit v1.2.3


From d693c5350933e664e5131c98babc7fbb2b4571aa Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 22 Jan 2019 22:01:00 +0200
Subject: SL-1932 Day Cycle Edit feature "Load Track" Part 1

---
 .../default/xui/en/floater_settings_picker.xml     | 46 ++++++++++++++++++----
 1 file changed, 38 insertions(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 7cc2c517ca..9ea949088f 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -13,10 +13,6 @@
         width="225">
 
     <!--  top static -->
-    <floater.string
-            name="choose_picture">
-        Click to choose a picture
-    </floater.string>
     <floater.string
             name="pick title">
         Pick:
@@ -30,10 +26,10 @@
             right="-6"
             bottom="-10"
             orientation="vertical">
-        <layout_panel name="temp"
+        <layout_panel name="inv_list"
                 border="false"
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 height="29"
                 min_height="29"
                 bg_alpha_color="blue"
@@ -72,14 +68,48 @@
                     filter_asset_type="settings" />
             </panel>
         </layout_panel>
+        <layout_panel name="pnl_combo"
+                border="false"
+                auto_resize="false"
+                user_resize="false"
+                visible="true"
+                height="29"
+                bg_alpha_color="blue"
+                background_visible="false">
+            <combo_box
+             allow_text_entry="false"
+             follows="left|top"
+             height="23"
+             left="10"
+             max_chars="100"
+             mouse_opaque="true"
+             name="track_selection"
+             top="1"
+             width="190">
+                <combo_box.item
+                 label="Sky4"
+                 name="Sky4"
+                 value="4" />
+                <combo_box.item
+                 label="Sky3"
+                 name="Sky3"
+                 value="3" />
+                <combo_box.item
+                 label="Sky2"
+                 name="Sky2"
+                 value="2" />
+                <combo_box.item
+                 label="Ground"
+                 name="Ground"
+                 value="1" />
+            </combo_box>
+        </layout_panel>
         <layout_panel name="temp"
                 border="false"
                 auto_resize="false"
                 user_resize="false"
                 height="29"
                 min_height="29">
-            <!--                bg_alpha_color="red"
-                background_visible="true" -->
             <button
                     follows="top|left"
                     height="20"
-- 
cgit v1.2.3


From deac9ae7d84776d1f8497af82ed39e5d53e722d9 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 23 Jan 2019 20:33:41 +0200
Subject: SL-1932 Day Cycle Edit feature "Load Track" Part 2

---
 .../default/xui/en/floater_settings_picker.xml     | 40 ++++++++++++----------
 1 file changed, 22 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 9ea949088f..55a1b540b4 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -17,6 +17,27 @@
             name="pick title">
         Pick:
     </floater.string>
+    <floater.string
+            name="pick_track">
+        SELECT TRACK
+    </floater.string>
+    <floater.string
+            name="pick_settings">
+        SELECT SETTINGS
+    </floater.string>
+
+    <floater.string
+            name="track_water">
+        Water
+    </floater.string>
+    <floater.string
+            name="track_ground">
+        Ground
+    </floater.string>
+    <floater.string
+            name="track_sky">
+        Sky[NUM]
+    </floater.string>
 
     <layout_stack name="test_stack"
             follows="all"
@@ -85,24 +106,7 @@
              mouse_opaque="true"
              name="track_selection"
              top="1"
-             width="190">
-                <combo_box.item
-                 label="Sky4"
-                 name="Sky4"
-                 value="4" />
-                <combo_box.item
-                 label="Sky3"
-                 name="Sky3"
-                 value="3" />
-                <combo_box.item
-                 label="Sky2"
-                 name="Sky2"
-                 value="2" />
-                <combo_box.item
-                 label="Ground"
-                 name="Ground"
-                 value="1" />
-            </combo_box>
+             width="190"/>
         </layout_panel>
         <layout_panel name="temp"
                 border="false"
-- 
cgit v1.2.3


From 88d4d85711a25772f3659850902e3a395ef2358c Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 25 Jan 2019 10:34:42 -0800
Subject: SL-10303

Modify sun disc shader to better position itself within the sun glow and to
fade as the sun approaches the horizon (to mask where the position difference is greatest).
---
 indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index e63b7e41b4..2aab41c5a0 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -78,7 +78,7 @@
                     decimal_digits="2"
                     follows="left|top"
                     height="16"
-                    increment="0.25"
+                    increment="0.01"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
@@ -254,7 +254,7 @@
                             decimal_digits="2"
                             follows="left|top"
                             height="16"
-                            increment="0.25"
+                            increment="0.01"
                             initial_value="0"
                             layout="topleft"
                             left_delta="5"
-- 
cgit v1.2.3


From ac865de287b2e740acd9f6a8724301146df73ccf Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 25 Jan 2019 22:02:16 +0200
Subject: SL-1945 Day Cycle Editor Copy Track

---
 .../skins/default/xui/en/floater_pick_track.xml    | 129 +++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_pick_track.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_pick_track.xml b/indra/newview/skins/default/xui/en/floater_pick_track.xml
new file mode 100644
index 0000000000..d8a9877be2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_pick_track.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<floater
+        legacy_header_height="0"
+        can_minimize="false"
+        can_resize="true"
+        height="140"
+        layout="topleft"
+        min_height="140"
+        min_width="225"
+        name="track picker"
+        help_topic="track_picker"
+        title="PICK: TRACK"
+        width="225">
+    <layout_stack name="adjuster"
+            follows="all"
+            animate="false"
+            top="0"
+            left="6"
+            right="-6"
+            bottom="-10"
+            orientation="vertical">
+        <layout_panel name="pnl_desc"
+                border="false"
+                auto_resize="false"
+                user_resize="false"
+                height="11"
+                min_height="10"
+                bg_alpha_color="blue"
+                background_visible="false">
+            <text
+                type="string"
+                length="1"
+                follows="left|top"
+                height="10"
+                layout="topleft"
+                left="5"
+                name="select_description"
+                mouse_opaque="false"
+                top="0"
+                width="300">
+                Select source sky:
+            </text>
+        </layout_panel>
+        <layout_panel name="pnl_traks"
+                border="false"
+                auto_resize="true"
+                user_resize="false"
+                height="29"
+                min_height="29"
+                bg_alpha_color="blue"
+                background_visible="false">
+            <radio_group
+                follows="all"
+                height="60"
+                layout="topleft"
+                top="0"
+                left="3"
+                right="-3"
+                bottom="-3"
+                name="track_selection"
+                width="100">
+                <radio_item
+                    height="20"
+                    label="Sky4 [ALT]"
+                    layout="topleft"
+                    left="0"
+                    name="radio_sky4"
+                    value="4"
+                    top="0"
+                    width="90" />
+                <radio_item
+                    height="20"
+                    label="Sky3 [ALT]"
+                    layout="topleft"
+                    left="0"
+                    name="radio_sky3"
+                    value="3"
+                    top_delta="20"
+                    width="90" />
+                <radio_item
+                    height="20"
+                    label="Sky2 [ALT]"
+                    layout="topleft"
+                    left="0"
+                    name="radio_sky2"
+                    value="2"
+                    top_delta="20"
+                    width="90" />
+                <radio_item
+                    height="20"
+                    label="Ground"
+                    layout="topleft"
+                    left="0"
+                    name="radio_sky1"
+                    value="1"
+                    top_delta="20"
+                    width="90" />
+            </radio_group>
+        </layout_panel>
+        <layout_panel name="pnl_ok_cancel"
+                border="false"
+                auto_resize="false"
+                user_resize="false"
+                height="29"
+                min_height="29">
+            <button
+                    follows="top|left"
+                    height="20"
+                    label="OK"
+                    label_selected="OK"
+                    layout="topleft"
+                    left="2"
+                    top="2"
+                    name="btn_select"
+                    width="100" />
+            <button
+                    follows="top|left"
+                    height="20"
+                    label="Cancel"
+                    label_selected="Cancel"
+                    layout="topleft"
+                    left_delta="110"
+                    top_delta="0"
+                    name="btn_cancel"
+                    width="100" />
+        </layout_panel>
+    </layout_stack>
+</floater>
-- 
cgit v1.2.3


From c8a79a59c94192741c8239eac6b34e50fe835bcd Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 30 Jan 2019 18:05:27 +0200
Subject: SL-10360 Show "Region environment" text for tracks if there is no
 parcel environment used.

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

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

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 32b6e56acd..51926351c0 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -19,6 +19,7 @@
     <string name="str_disallowed">The estate manager does not allow changing parcel environments in this region.</string>
     <string name="str_too_small">The parcel must be at least 128 square meters to support an environment.</string>
     <string name="str_empty">(empty)</string>
+    <string name="str_region_env">(region environment)</string>
     <layout_stack 
             width="530"
             height="367"
-- 
cgit v1.2.3


From 16b47db736fed0995eaeeed77ba4dd0d310f1072 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 30 Jan 2019 21:51:59 +0200
Subject: SL-10279 Remake altitude 'bumping'

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

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

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 51926351c0..77858ecbc4 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -251,7 +251,6 @@
                                 enabled="false"
                                 top_delta="3"
                                 left_pad="21"
-                                xxxleft="-160"
                                 height="20"
                                 layout="topleft"
                                 name="edt_invname_alt1"
@@ -296,7 +295,6 @@
                                 enabled="false"
                                 top_delta="3"
                                 left_pad="21"
-                                xxxleft="-160"
                                 height="20"
                                 layout="topleft"
                                 name="edt_invname_alt2"
-- 
cgit v1.2.3


From c7e02b0835cbb50777c677f618c4a957e69fabee Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 30 Jan 2019 14:36:46 -0800
Subject: SL-9925: Viewer now shows an error message if import from legacy
 windlight fails.

---
 indra/newview/skins/default/xui/en/notifications.xml | 7 +++++--
 indra/newview/skins/default/xui/en/strings.xml       | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9ca9d4cd51..5ea5023c94 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11267,7 +11267,10 @@ This Region does not support environmental settings.
    name="WLImportFail"
    persist="true"
    type="alertmodal">
-Unable to import legacy Windlight settings from [FILE].
+Unable to import legacy Windlight settings [NAME] from 
+[FILE].
+
+[REASONS]
   <tag>fail</tag>
   </notification>
 
@@ -11331,5 +11334,5 @@ You may not edit settings directly from the libary.
 Please copy to your own inventory and try again.
   <tag>fail</tag>
   </notification>
-
+  
 </notifications>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1879ce6f32..71133f582f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -378,6 +378,11 @@ Error in upload request.  Please visit
 http://secondlife.com/support for help fixing this problem.
 </string>
 
+    <!-- Settings errors -->
+    <string name="SettingValidationError">Validation failed for importing settings [NAME]</string>
+    <string name="SettingImportFileError">Could not open file [FILE]</string>
+    <string name="SettingParseFileError">Could not open file [FILE]</string>
+    <string name="SettingTranslateError">Could not translate legacy windlight [NAME]</string>
 	<!-- Asset Type human readable names:  these will replace variable [TYPE] in notification FailedToFindWearable* -->
 	<!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem -->
 	<string name="texture">texture</string>
-- 
cgit v1.2.3


From 23193e92d3a8af2724f9b8eecf65f446d025fdc4 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 1 Feb 2019 18:49:59 +0200
Subject: SL-9851 Adjust UI limits

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 11a852f40b..50d4c52a10 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -82,7 +82,7 @@
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
-                    min_val="0"
+                    min_val="0.01"
                     max_val="3"
                     name="cloud_scale"
                     top_delta="20"
-- 
cgit v1.2.3


From 910de3048957411a8e69b09c6f98909cbf4b57fc Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 5 Feb 2019 10:07:30 -0800
Subject: SL-10304

Fix panel_settings_water increments for Underwater Modifier and wave directions.
---
 indra/newview/skins/default/xui/en/panel_settings_water.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 88d0f7827b..1d4f980273 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -82,7 +82,7 @@
                     width="150">
                 Underwater Modifier:</text>
             <slider
-                    decimal_digits="1"
+                    decimal_digits="2"
                     follows="left|top"
                     height="16"
                     increment="0.01"
@@ -194,10 +194,10 @@
                         top_delta="21"
                         min_val_x="-20"
                         max_val_x="20"
-                        increment_x="0.5f"
+                        increment_x="0.01f"
                         min_val_y="-20"
                         max_val_y="20"
-                        increment_y="0.5f"
+                        increment_y="0.01f"
                         arrow_color="white"/>
                     
                     <text
@@ -220,6 +220,8 @@
                         max_val_x="20"
                         min_val_y="-20"
                         max_val_y="20" 
+                        increment_x="0.01f"
+                        increment_y="0.01f"
                         arrow_color="white"/>
 
                     <text
-- 
cgit v1.2.3


From 43327798dec61590dc256697771e0423eb1ece9c Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 7 Feb 2019 17:58:25 +0200
Subject: SL-10495 [EEP] Include a confirmation when clicking the Use Region
 Settings button

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5ea5023c94..dfc392e1f7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11308,6 +11308,19 @@ Are you sure you want to continue?
      yestext="Yes"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="SettingsConfirmReset"
+   type="alertmodal">
+You are about to remove all applied settings.
+Are you sure you want to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+  
   <notification
    icon="alertmodal.tga"
    name="SettingsMakeNoTrans"
-- 
cgit v1.2.3


From c8d8414b3b2e83fbaffd6e48f55ca14a3cb27ca4 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 8 Feb 2019 19:06:20 +0200
Subject: SL-10509 EEP Settings Picker gets closed by drag&drop

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 55a1b540b4..132d23492f 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -76,6 +76,8 @@
               bg_alpha_color="DkGray2">
                 <asset_filtered_inv_panel
                     allow_multi_select="false"
+                    allow_drag="false"
+                    accepts_drag_and_drop="false"
                     suppress_folder_menu="true"
                     bg_visible="true"
                     bg_alpha_color="DkGray2"
-- 
cgit v1.2.3


From 65927e0a76aaf8ff4dc268acdb12007265ff3a14 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 13 Feb 2019 13:09:14 -0800
Subject: SL-10181, SL-10546

Fix distortion map rendering in deferred mode not including underwater fog effects.

Fix distortion map rendering not including post-deferred content at all.

Fix distortion map rendering not including anything but sky when camera is underwater.

Update sun_up_factor/sunmoon_glow_factor uniforms even when sun disc isn't in use.
---
 indra/newview/skins/default/xui/en/panel_settings_water.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 1d4f980273..991ce25bec 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -89,7 +89,8 @@
                     initial_value="0"
                     layout="top"
                     left_delta="15"
-                    max_val="10"
+                    min_val="0.0"
+                    max_val="20.0"
                     name="water_underwater_mod"
                     top_delta="20"
                     width="150"
-- 
cgit v1.2.3


From 2108d5ee38a955f140f40aa71705aa04e4487362 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 14 Feb 2019 16:19:39 -0800
Subject: SL-10464: A couple last fixes dealing with region crossings. 
 Environment Experiences are still stripped when changing regions.  Even if
 destination region participates in the experience.

---
 .../default/xui/en/panel_settings_sky_sunmoon.xml  | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 2aab41c5a0..bbba5ba729 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -176,6 +176,18 @@
                     top_delta="15"
                     width="250"
                     can_edit_text="true"/>
+                    
+            <check_box
+                    control_name="sunbeacon"
+                    width="60"
+                    height="16"
+                    label="Show Beacon"
+                    layout="topleft"
+                    name="sunbeacon" 
+                    right="-50"
+                    bottom="-10"
+                    follows="bottom|right"/>
+                    
         </layout_panel>
         <layout_panel
                 border="false"
@@ -287,6 +299,17 @@
                             top_delta="15"
                             width="130"
                             can_edit_text="true"/>
+                <check_box
+                        control_name="moonbeacon"
+                        width="60"
+                        height="16"
+                        label="Show Beacon"
+                        layout="topleft"
+                        name="moonbeacon" 
+                        right="-50"
+                        bottom="-10"
+                        follows="bottom|right"/>
+                            
                 </layout_panel>
             </layout_stack>
         </layout_panel>
-- 
cgit v1.2.3


From 4f14dccffaa3b38377ad55486e38e4587a233319 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 19 Feb 2019 16:13:42 -0800
Subject: SL-10570: Additional checking when loading a track from another day
 cycle. Restore original track if error. Extra messages to user.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index dfc392e1f7..5ed3bd5df5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11347,5 +11347,32 @@ You may not edit settings directly from the libary.
 Please copy to your own inventory and try again.
   <tag>fail</tag>
   </notification>
+
+    <notification
+   icon="notify.tga"
+   name="EnvironmentApplyFailed"
+   persist="true"
+   type="alertmodal">
+We have encountered an issue with these settings.  They can not be saved or applied at this time.
+  <tag>fail</tag>
+  </notification>
+
+    <notification
+   icon="notify.tga"
+   name="TrackLoadFailed"
+   persist="true"
+   type="alertmodal">
+Unable to load the track into [TRACK].
+  <tag>fail</tag>
+  </notification>
+
+    <notification
+   icon="notify.tga"
+   name="TrackLoadMismatch"
+   persist="true"
+   type="alertmodal">
+Unable to load the track from [TRACK1] into [TRACK2].
+  <tag>fail</tag>
+  </notification>
   
 </notifications>
-- 
cgit v1.2.3


From 8382cc2f2c2944e8a2a47e30dc22b1eb99ce34cb Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 22 Feb 2019 15:04:47 -0800
Subject: Adust highlight color to white on timeline.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 284b30da6c..1b5bd90748 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -255,6 +255,7 @@
                                 max_val="1"
                                 name="WLDayCycleFrames"
                                 show_text="false"
+                                thumb_highlight_color="white"
                                 thumb_width="12"
                                 top_pad="15"
                                 width="525" />
-- 
cgit v1.2.3


From 8740c54fb074b8ab2349dc5a3317e1578de3d812 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 7 Mar 2019 15:26:01 -0800
Subject: SL-10700: If a track is empty show the name of the track used below
 it.  If all tracks are empty for a parcel are empty report thath it uses
 region settings.

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

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

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 77858ecbc4..bac27f7457 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -11,7 +11,6 @@
         width="530"> 
     <string name="str_label_use_default">Use Default Settings</string>
     <string name="str_label_use_region">Use Region Settings</string>
-    <string name="str_unknow_inventory">Unknown</string>
     <string name="str_altitude_desription">Sky [INDEX]([ALTITUDE]m)</string>
     <string name="str_no_parcel">No parcel is selected. Environmental settings are disabled.</string>
     <string name="str_cross_region">Environmental settings are not available across region boundries.</string>
-- 
cgit v1.2.3


From 3a78da70ad14eab11218cc056c2a3703af1b9738 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 29 Mar 2019 17:39:19 +0200
Subject: SL-10833 FIXED [EEP] Text in the Sky Altitudes boxes is low contrast
 and difficult to read.

---
 .../newview/skins/default/xui/en/panel_region_environment.xml  | 10 ++++++++++
 indra/newview/skins/default/xui/en/widgets/line_editor.xml     |  1 +
 2 files changed, 11 insertions(+)

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

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 bac27f7457..4d4ee7d730 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -253,6 +253,8 @@
                                 height="20"
                                 layout="topleft"
                                 name="edt_invname_alt1"
+                                use_bg_color="true"
+                                bg_color="TextBgReadOnlyColor"
                                 width="155">
                             Unknown
                         </line_editor>
@@ -297,6 +299,8 @@
                                 height="20"
                                 layout="topleft"
                                 name="edt_invname_alt2"
+                                use_bg_color="true"
+                                bg_color="TextBgReadOnlyColor"
                                 width="155">
                             Unknown
                         </line_editor>
@@ -342,6 +346,8 @@
                                 height="20"
                                 layout="topleft"
                                 name="edt_invname_alt3"
+                                use_bg_color="true"
+                                bg_color="TextBgReadOnlyColor"
                                 width="155">
                             Unknown
                         </line_editor>
@@ -460,6 +466,8 @@
                            height="20"
                            layout="topleft"
                            name="edt_invname_ground"
+                           use_bg_color="true"
+                           bg_color="TextBgReadOnlyColor"
                            width="155">
                             Unknown
                         </line_editor>
@@ -514,6 +522,8 @@
                                 height="20"
                                 layout="topleft"
                                 name="edt_invname_water"
+                                use_bg_color="true"
+                                bg_color="TextBgReadOnlyColor"
                                 width="155">
                             Unknown
                         </line_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
index a054960bf8..f39e086196 100644
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
@@ -6,6 +6,7 @@
              commit_on_focus_lost="true"
              ignore_tab="true"
              cursor_color="TextCursorColor"
+             bg_color="White"
              text_color="TextFgColor"
 			 text_pad_left="2"
              text_readonly_color="TextFgReadOnlyColor"
-- 
cgit v1.2.3


From e24237b6af504ff8faea02c8ab22344f2452364e Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 3 Apr 2019 14:52:59 -0700
Subject: SL-10189, SL-10880: Mark the day instance so that it does not try to
 reanimate a day cycle when setting a fixed sky. Add new floater for setting
 the shared environment to local and allowing modifications.

---
 .../default/xui/en/floater_adjust_environment.xml  | 365 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |   7 +
 2 files changed, 372 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_adjust_environment.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
new file mode 100644
index 0000000000..e2cf809c9c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater layout="topleft"
+         name="env_adjust_snapshot"
+         help_topic="day_presets"
+         save_rect="false"
+         title="Personal Lighting"
+         width="845"
+         height="225"
+         min_width="500"
+         min_height="225"
+         single_instance="true"
+         can_resize="false">
+    <layout_stack name="outer_stack"
+                  width="845"
+                  height="212"
+                  follows="all"
+                  animate="false"
+                  top="0"
+                  orientation="vertical">
+        <!-- If I put in a timeline it would go here -->
+        <layout_panel name="env_controls"
+                      border="false"
+                      bevel_style="in"
+                      auto_resize="true"
+                      user_resize="true"
+                      height="150"
+                      min_height="0"
+                      visible="true">
+            <layout_stack name="settings_stack"
+                          width="855"
+                          height="150"
+                          follows="all"
+                          animate="false"
+                          orientation="horizontal">
+                <layout_panel border="false"
+                              bevel_style="in"
+                              auto_resize="false"
+                              user_resize="false"
+                              visible="true"
+                              width="160"
+                              height="150">
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left="10"
+                          top="5"
+                          width="80">Ambient:</text>
+                    <color_swatch can_apply_immediately="true"
+                                  follows="left|top"
+                                  height="37"
+                                  label_height="0"
+                                  layout="topleft"
+                                  left_delta="0"
+                                  name="ambient_light"
+                                  top_pad="5"
+                                  width="60"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="0"
+                          top_pad="10"
+                          width="80">Blue Horizon:</text>
+                    <color_swatch can_apply_immediately="true"
+                                  follows="left|top"
+                                  height="37"
+                                  label_height="0"
+                                  layout="topleft"
+                                  left_delta="0"
+                                  name="blue_horizon"
+                                  top_pad="5"
+                                  width="60"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="0"
+                          top_pad="10"
+                          width="80">Blue Density:</text>
+                    <color_swatch can_apply_immediately="true"
+                                  follows="left|top"
+                                  height="37"
+                                  label_height="0"
+                                  layout="topleft"
+                                  left_delta="0"
+                                  name="blue_density"
+                                  top_pad="5"
+                                  width="60"/>
+                    <text follows="right|top"
+                          height="10"
+                          layout="topleft"
+                          right="-10"
+                          top="5"
+                          width="60">Sun Color:</text>
+                    <color_swatch can_apply_immediately="true"
+                                  follows="left|top"
+                                  height="37"
+                                  label_height="0"
+                                  layout="topleft"
+                                  left_delta="0"
+                                  name="sun_color"
+                                  top_pad="5"
+                                  width="60"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="0"
+                          top_pad="10"
+                          width="80">Cloud Color:</text>
+                    <color_swatch can_apply_immediately="true"
+                                  follows="left|top"
+                                  height="37"
+                                  label_height="0"
+                                  layout="topleft"
+                                  left_delta="0"
+                                  name="cloud_color"
+                                  top_pad="5"
+                                  width="60"/>
+                </layout_panel>
+                <layout_panel border="false"
+                              bevel_style="in"
+                              auto_resize="false"
+                              user_resize="false"
+                              visible="true"
+                              width="200"
+                              height="150">
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="5"
+                          top_pad="5"
+                          width="80">Haze Horizon:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="5"
+                            name="haze_horizon"
+                            top_pad="5"
+                            width="185"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="5"
+                          width="80">Haze Density:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="5"
+                            name="haze_density"
+                            top_pad="5"
+                            width="185"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="5"
+                          width="185">Cloud Coverage:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="1"
+                            name="cloud_coverage"
+                            top_pad="5"
+                            width="185"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="5"
+                          width="185">Cloud Scale:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0.01"
+                            max_val="3"
+                            name="cloud_scale"
+                            top_pad="5"
+                            width="185"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="15"
+                          width="80">Scene Gamma:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            max_val="20"
+                            name="scene_gamma"
+                            top_pad="5"
+                            width="185"
+                            can_edit_text="true"/>
+                </layout_panel>
+                <layout_panel border="false"
+                              bevel_style="in"
+                              auto_resize="false"
+                              user_resize="false"
+                              height="150"
+                              width="310"
+                              min_height="0"
+                              visible="true">
+                    <text follows="top|left"
+                          font="SansSerifBold"
+                          height="10"
+                          layout="topleft"
+                          name="label"
+                          left="5"
+                          top="5"
+                          width="105">Sun:</text>
+                    <sun_moon_trackball name="sun_rotation"
+                                        follows="left|top"
+                                        left_delta="0"
+                                        top_delta="20"
+                                        height="150"
+                                        width="150"
+                                        thumb_mode="sun"/>
+                    <check_box control_name="sunbeacon"
+                               width="60"
+                               height="16"
+                               label="Show Beacon"
+                               layout="topleft"
+                               name="sunbeacon"
+                               left_delta="55"
+                               bottom="-10"
+                               follows="bottom|right"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_pad="40"
+                          top="25"
+                          width="80">Scale:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0.25"
+                            max_val="20"
+                            name="sun_scale"
+                            top_delta="15"
+                            width="130"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="5"
+                          width="100">Glow Focus:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="-2"
+                            max_val="2"
+                            name="glow_focus"
+                            top_pad="5"
+                            width="130"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="5"
+                          width="200">Glow Size:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="1.99"
+                            name="glow_size"
+                            top_pad="5"
+                            width="130"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="10"
+                          width="200">Star Brightness:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="500"
+                            name="star_brightness"
+                            top_pad="5"
+                            width="130"
+                            can_edit_text="true"/>
+                </layout_panel>
+                <layout_panel border="false"
+                              bevel_style="in"
+                              auto_resize="false"
+                              user_resize="false"
+                              height="150"
+                              width="160"
+                              min_height="0"
+                              visible="true">
+                    <text follows="top|left"
+                          font="SansSerifBold"
+                          height="10"
+                          layout="topleft"
+                          name="label"
+                          left="5"
+                          top="5"
+                          width="105">Moon:</text>
+                    <sun_moon_trackball name="moon_rotation"
+                                        follows="left|top"
+                                        left_delta="0"
+                                        top_delta="20"
+                                        height="150"
+                                        width="150"
+                                        thumb_mode="moon"/>
+                    <check_box control_name="moonbeacon"
+                               width="60"
+                               height="16"
+                               label="Show Beacon"
+                               layout="topleft"
+                               name="moonbeacon"
+                               right="-50"
+                               bottom="-10"
+                               follows="bottom|right"/>
+                </layout_panel>
+            </layout_stack>
+        </layout_panel>
+    </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f676df5e8b..2eab312ecd 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -715,6 +715,13 @@
                  function="World.EnvSettings"
                  parameter="my_environs" />
             </menu_item_call>
+            <menu_item_call
+             label="Personal Lighting..."
+             name="adjustment_tool">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="adjust_tool" />
+            </menu_item_call>
             <menu_item_separator/>
             <menu_item_check
              label="Pause Clouds"
-- 
cgit v1.2.3


From 66aa3d390d78eab482ce51bc916789a35b6dd50f Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 8 Apr 2019 15:26:59 +0300
Subject: SL-10893 Remove "Show Empty Folders" option

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index c9238b80b3..854ac8b758 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -114,22 +114,6 @@
                        filter_asset_type="settings"/>
             </panel>
         </layout_panel>
-        <layout_panel
-                auto_resize="false"
-                user_resize="false"
-                tab_group="1"
-                height="14">
-            <check_box
-                    follows="left|bottom"
-                    height="14"
-                    initial_value="false"
-                    label="Show Empty Folders"
-                    layout="topleft"
-                    name="chk_showfolders"
-                    top="2"
-                    left_delta="-1"
-                    width="200" />
-        </layout_panel>
         <layout_panel
                 auto_resize="false"
                 user_resize="true"
-- 
cgit v1.2.3


From cc70bf9ea04b6c934fec23d693d6a5b76eaf6df6 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 16 Apr 2019 16:26:52 +0300
Subject: SL-10957 [EEP] Add Reset button to revert to shared environment

---
 .../skins/default/xui/en/floater_adjust_environment.xml   | 14 ++++++++++++--
 indra/newview/skins/default/xui/en/notifications.xml      | 15 ++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
index e2cf809c9c..fc356c10c7 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -5,14 +5,14 @@
          save_rect="false"
          title="Personal Lighting"
          width="845"
-         height="225"
+         height="230"
          min_width="500"
          min_height="225"
          single_instance="true"
          can_resize="false">
     <layout_stack name="outer_stack"
                   width="845"
-                  height="212"
+                  height="220"
                   follows="all"
                   animate="false"
                   top="0"
@@ -84,6 +84,16 @@
                                   name="blue_density"
                                   top_pad="5"
                                   width="60"/>
+                    <button
+                      follows="left|top"
+                      height="23"
+                      label="Reset"
+                      tool_tip="Close and reset to Shared Environment"
+                      layout="topleft"
+                      name="btn_reset"
+                      left_delta="-2"
+                      top_pad="10"
+                      width="100"/>
                     <text follows="right|top"
                           height="10"
                           layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 42b1a1ec1b..85b55346c2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11345,7 +11345,20 @@ Are you sure you want to continue?
      notext="No"
      yestext="Yes"/>
   </notification>
-  
+
+  <notification
+ icon="alertmodal.tga"
+ name="PersonalSettingsConfirmReset"
+ type="alertmodal">
+    You are about to remove all applied Personal lighting settings.
+    Are you sure you want to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="SettingsMakeNoTrans"
-- 
cgit v1.2.3


From 32598518816be6c312acc9b027d3a28ed807429a Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 18 Apr 2019 17:35:28 +0300
Subject: SL-10983 [EEP] Add a search box to the "My Environments" floater

---
 .../skins/default/xui/en/floater_my_environments.xml        | 13 ++++++++++---
 indra/newview/skins/default/xui/en/notifications.xml        |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index 854ac8b758..7e65e5d69c 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -28,9 +28,8 @@
                 border="true"
                 bevel_style="in"
                 auto_resize="false"
-                user_resize="true"
                 tab_group="1"
-                height="24"
+                height="54"
                 name="filter_panel"
                 label="Filters"
                 font="SansSerifBold">
@@ -82,6 +81,15 @@
                     name="chk_water"
                     top_delta="0"
                     width="60" />
+          <filter_editor
+                  follows="left|top|right"
+                  height="23"
+                  label="Filter Environments"
+                  layout="topleft"
+                  left="4"
+                  name="flt_search"
+                  top_pad="6"
+                  right="-4" />
         </layout_panel>
         <layout_panel
                 auto_resize="true"
@@ -116,7 +124,6 @@
         </layout_panel>
         <layout_panel
                 auto_resize="false"
-                user_resize="true"
                 tab_group="1"
                 height="31"
                 name="pnl_control"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index fa5b6062df..fc3556ddc0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11410,8 +11410,8 @@ Are you sure you want to continue?
  icon="alertmodal.tga"
  name="PersonalSettingsConfirmReset"
  type="alertmodal">
-    You are about to remove all applied Personal lighting settings.
-    Are you sure you want to continue?
+You are about to remove all applied Personal lighting settings.
+Are you sure you want to continue?
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
-- 
cgit v1.2.3


From ce9cf1027f733560e29f77c4a883bd9b5338f9d8 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 22 Apr 2019 16:02:53 +0300
Subject: SL-10982 [EEP] Personal Lighting - Add options to select water maps /
 cloud textures

---
 .../default/xui/en/floater_adjust_environment.xml  | 50 ++++++++++++++++------
 1 file changed, 38 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
index fc356c10c7..59589e3665 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -5,14 +5,14 @@
          save_rect="false"
          title="Personal Lighting"
          width="845"
-         height="230"
+         height="240"
          min_width="500"
-         min_height="225"
+         min_height="235"
          single_instance="true"
          can_resize="false">
     <layout_stack name="outer_stack"
                   width="845"
-                  height="220"
+                  height="230"
                   follows="all"
                   animate="false"
                   top="0"
@@ -47,7 +47,7 @@
                           width="80">Ambient:</text>
                     <color_swatch can_apply_immediately="true"
                                   follows="left|top"
-                                  height="37"
+                                  height="40"
                                   label_height="0"
                                   layout="topleft"
                                   left_delta="0"
@@ -62,7 +62,7 @@
                           width="80">Blue Horizon:</text>
                     <color_swatch can_apply_immediately="true"
                                   follows="left|top"
-                                  height="37"
+                                  height="40"
                                   label_height="0"
                                   layout="topleft"
                                   left_delta="0"
@@ -77,7 +77,7 @@
                           width="80">Blue Density:</text>
                     <color_swatch can_apply_immediately="true"
                                   follows="left|top"
-                                  height="37"
+                                  height="40"
                                   label_height="0"
                                   layout="topleft"
                                   left_delta="0"
@@ -97,12 +97,12 @@
                     <text follows="right|top"
                           height="10"
                           layout="topleft"
-                          right="-10"
+                          right="-12"
                           top="5"
                           width="60">Sun Color:</text>
                     <color_swatch can_apply_immediately="true"
                                   follows="left|top"
-                                  height="37"
+                                  height="10"
                                   label_height="0"
                                   layout="topleft"
                                   left_delta="0"
@@ -113,17 +113,43 @@
                           height="10"
                           layout="topleft"
                           left_delta="0"
-                          top_pad="10"
+                          top_pad="5"
                           width="80">Cloud Color:</text>
                     <color_swatch can_apply_immediately="true"
                                   follows="left|top"
-                                  height="37"
+                                  height="10"
                                   label_height="0"
                                   layout="topleft"
                                   left_delta="0"
                                   name="cloud_color"
                                   top_pad="5"
                                   width="60"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="0"
+                          top_pad="10"
+                          name="cloud_map_label"
+                          width="80">Cloud Image:</text>
+                    <texture_picker height="63"
+                                    layout="topleft"
+                                    left_delta="0"
+                                    name="cloud_map"
+                                    top_pad="5"
+                                    width="60"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="0"
+                          top_pad="-13"
+                          name="cloud_map_label"
+                          width="80">Water Image:</text>
+                    <texture_picker height="63"
+                                    layout="topleft"
+                                    left_delta="0"
+                                    name="water_normal_map"
+                                    top_pad="5"
+                                    width="60"/>
                 </layout_panel>
                 <layout_panel border="false"
                               bevel_style="in"
@@ -257,7 +283,7 @@
                                layout="topleft"
                                name="sunbeacon"
                                left_delta="55"
-                               bottom="-10"
+                               bottom="-20"
                                follows="bottom|right"/>
                     <text follows="left|top"
                           height="10"
@@ -366,7 +392,7 @@
                                layout="topleft"
                                name="moonbeacon"
                                right="-50"
-                               bottom="-10"
+                               bottom="-20"
                                follows="bottom|right"/>
                 </layout_panel>
             </layout_stack>
-- 
cgit v1.2.3


From 89884ed1465ed4baf811e05172dd13f9af97bcbb Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 2 May 2019 12:58:48 +0300
Subject: SL-11057 Revert SL-10893 change to restore "Show All Folders"

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index 7e65e5d69c..46894ded80 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -123,6 +123,22 @@
             </panel>
         </layout_panel>
         <layout_panel
+                auto_resize="false"
+                user_resize="false"
+                tab_group="1"
+                height="15">
+            <check_box
+                    follows="left|bottom"
+                    height="14"
+                    initial_value="false"
+                    label="Show All Folders"
+                    layout="topleft"
+                    name="chk_showfolders"
+                    top="2"
+                    left_delta="-1"
+                    width="200" />
+        </layout_panel>
+        <layout_panel
                 auto_resize="false"
                 tab_group="1"
                 height="31"
-- 
cgit v1.2.3


From 24acb7d5c3b6c3af4d7d814b8ccb0b9652eb38d3 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 3 May 2019 14:58:51 -0700
Subject: Fix some line-endings to be newline only.

---
 .../default/xui/en/floater_my_environments.xml     | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index 46894ded80..6aff387dcb 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -124,21 +124,21 @@
         </layout_panel>
         <layout_panel
                 auto_resize="false"
-                user_resize="false"
-                tab_group="1"
-                height="15">
-            <check_box
-                    follows="left|bottom"
-                    height="14"
-                    initial_value="false"
-                    label="Show All Folders"
-                    layout="topleft"
-                    name="chk_showfolders"
-                    top="2"
-                    left_delta="-1"
-                    width="200" />
-        </layout_panel>
-        <layout_panel
+                user_resize="false"
+                tab_group="1"
+                height="15">
+            <check_box
+                    follows="left|bottom"
+                    height="14"
+                    initial_value="false"
+                    label="Show All Folders"
+                    layout="topleft"
+                    name="chk_showfolders"
+                    top="2"
+                    left_delta="-1"
+                    width="200" />
+        </layout_panel>
+        <layout_panel
                 auto_resize="false"
                 tab_group="1"
                 height="31"
-- 
cgit v1.2.3


From ce910edb0ed6222ad402e4310ccef6a0d0207dd0 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 13 May 2019 16:28:33 +0300
Subject: SL-11150 FIXED [EEP] Settings names get truncated.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index 348c0ce195..dbf91b0834 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -44,7 +44,7 @@
                     width="250"
                     name="settings_name"
                     prevalidate_callback="ascii"
-                    max_length_chars="32"
+                    max_length_chars="63"
                     height="20"/>
             <button
                     height="23"
-- 
cgit v1.2.3


From 25f9dc9b5a44e2d91a5d55d4cce6149a55e16432 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 22 May 2019 18:05:15 +0300
Subject: SL-10984 [EEP] Add a toolbar button to open My Environments

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 26d22ed0a9..2ac385d3f3 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4099,6 +4099,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Conversations_Label">Conversations</string>
   <string name="Command_Compass_Label">Compass</string>
   <string name="Command_Destinations_Label">Destinations</string>
+  <string name="Command_Environments_Label">My Environments</string>
   <string name="Command_Facebook_Label">Facebook</string>
   <string name="Command_Flickr_Label">Flickr</string>
   <string name="Command_Gestures_Label">Gestures</string>
@@ -4132,6 +4133,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Conversations_Tooltip">Converse with everyone</string>
   <string name="Command_Compass_Tooltip">Compass</string>
   <string name="Command_Destinations_Tooltip">Destinations of interest</string>
+  <string name="Command_Environments_Tooltip">My Environments</string>
   <string name="Command_Facebook_Tooltip">Post to Facebook</string>
   <string name="Command_Flickr_Tooltip">Upload to Flickr</string>
   <string name="Command_Gestures_Tooltip">Gestures for your avatar</string>
-- 
cgit v1.2.3


From d0a0eede63fdbd4ba597b86cbfbeb5b394ed2395 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 23 May 2019 09:58:33 -0700
Subject: Add render debug controls for forcing disable of ambient, sun, and
 local light contributions (engages AMBIENT_KILL, SUNLIGHT_KILL, and
 LOCAL_LIGHT_KILL defines in shaders to accomplish   those tasks as required
 by each render mode).

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8aa2c8d931..d9b06347ca 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2951,6 +2951,36 @@
                  function="ToggleControl"
                  parameter="TextureDisable" />
             </menu_item_check>
+          <menu_item_check
+             label="Disable Ambient"
+             name="Disable Ambient">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="AmbientDisable" />
+            <menu_item_check.on_click
+             function="ToggleShaderControl"
+             parameter="AmbientDisable" />
+          </menu_item_check>
+          <menu_item_check
+             label="Disable Sunlight"
+             name="Disable Sunlight">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="SunlightDisable" />
+            <menu_item_check.on_click
+             function="ToggleShaderControl"
+             parameter="SunlightDisable" />
+          </menu_item_check>
+          <menu_item_check
+             label="Disable Local Lights"
+             name="Disable Local Lights">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="LocalLightDisable" />
+            <menu_item_check.on_click
+             function="ToggleShaderControl"
+             parameter="LocalLightDisable" />
+          </menu_item_check>
             <menu_item_check
               label="Full Res Textures"
              name="Rull Res Textures">
-- 
cgit v1.2.3


From 9f2fc2b433f1c67b85786467ab17ff0b662b90f7 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 24 May 2019 17:54:36 +0300
Subject: SL-11273 FIXED [EEP] The beacon checkboxes in the Day Cycle window
 can only be changed while a keyframe is selected.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index bbba5ba729..0e3de821d1 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -21,6 +21,7 @@
                 auto_resize="true"
                 user_resize="false"
                 visible="true"
+                name="sun_layout"
                 height="400">
             <text
                     follows="left|top"
@@ -209,6 +210,7 @@
                         auto_resize="true"
                         user_resize="false"
                         visible="true"
+                        name="moon_layout"
                         height="220">
                     <text
                             follows="left|top"
-- 
cgit v1.2.3


From 48401b224d778b21e4d8ae08365718591907d14b Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 5 Jun 2019 08:58:28 -0700
Subject: SL-9989

Clamp fog distance multiplier to >= 0.05 and adjust min range on control as well.

Make sky shaders use dist mul consistently.
---
 indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index e6fdc76de1..bec793bbee 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -283,10 +283,10 @@
                             follows="left|top"
                             height="16"
                             increment="0.01"
-                            initial_value="0"
+                            initial_value="0.8"
                             layout="topleft"
                             left_delta="5"
-                            min_val="0"
+                            min_val="0.05"
                             max_val="1000"
                             name="distance_multip"
                             top_delta="20"
-- 
cgit v1.2.3


From 6504a7b598cd70d316ade1b218ac6144bcce7411 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 6 Jun 2019 11:53:54 +0300
Subject: SL-11358 FIXED [EEP] Setting type name and other strings are missing.

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2ac385d3f3..f6bc35be3b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -315,6 +315,17 @@ Please try logging in again in a minute.</string>
 	<string name="BUTTON_DOCK">Dock</string>
 	<string name="BUTTON_HELP">Show Help</string>
 
+	<!-- ToolTips for notecards -->
+	<string name="TooltipNotecardNotAllowedTypeDrop">
+Items of this type can't be attached
+to notecards on this region.
+	</string>
+	<string name="TooltipNotecardOwnerRestrictedDrop">
+Only items with unrestricted
+'next owner' permissions
+can be attached to notecards.
+	</string>
+
 	<!-- searching - generic -->
 	<string name="Searching">Searching...</string>
 	<string name="NoneFound">None found.</string>
@@ -367,6 +378,11 @@ Error in upload request.  Please visit
 http://secondlife.com/support for help fixing this problem.
 </string>
 
+	<!-- Settings errors -->
+	<string name="SettingValidationError">Validation failed for importing settings [NAME]</string>
+	<string name="SettingImportFileError">Could not open file [FILE]</string>
+	<string name="SettingParseFileError">Could not open file [FILE]</string>
+	<string name="SettingTranslateError">Could not translate legacy windlight [NAME]</string>
 	<!-- Asset Type human readable names:  these will replace variable [TYPE] in notification FailedToFindWearable* -->
 	<!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem -->
 	<string name="texture">texture</string>
@@ -394,7 +410,8 @@ http://secondlife.com/support for help fixing this problem.
 	<string name="favorite">favorite</string>
 	<string name="symbolic link">link</string>
 	<string name="symbolic folder link">folder link</string>
-  <string name="mesh">mesh</string>
+	<string name="settings blob">settings</string>
+	<string name="mesh">mesh</string>
 
 	<!-- llvoavatar. Displayed in the avatar chat bubble -->
 	<string name="AvatarEditingAppearance">(Editing Appearance)</string>
@@ -519,6 +536,7 @@ http://secondlife.com/support for help fixing this problem.
 	<string name="ManageEstateSilently">Manage your estates silently</string>
 	<string name="ChangeYourDefaultAnimations">Change your default animations</string>
 	<string name="ForceSitAvatar">Force your avatar to sit</string>
+	<string name="ChangeEnvSettings">Change your environment settings</string>
 	
 	<string name="NotConnected">Not Connected</string>
 	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
-- 
cgit v1.2.3


From 6d90dd996ed4381726a2c1666c0ea3af0984c7af Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 10 Jun 2019 09:45:45 -0700
Subject: Modify panel_region_environment XUI to eliminate parser
 errors/warnings (10625 guess).

---
 .../default/xui/en/panel_region_environment.xml     | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

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

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 4d4ee7d730..b5be16db45 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -22,13 +22,11 @@
     <layout_stack 
             width="530"
             height="367"
-                auto_resize="true"
             follows="all"
             layout="topleft"
             animate="false"
             orientation="vertical">
         <layout_panel
-                auto_resize="true"
                 user_resize="false"
                 name="pnl_environment_disabled"
                 visible="false">
@@ -42,20 +40,18 @@
             </text>
         </layout_panel>
         <layout_panel
-                auto_resize="true"
                 user_resize="false"
                 min_height="0"
                 name="pnl_environment_config"
                 visible="true">
             <layout_stack 
-                    xxxwidth="530"
-                    xxxheight="367"
+                    width="530"
+                    height="367"
                     follows="all"
                     layout="topleft"
                     animate="false"
                     orientation="horizontal">
                 <layout_panel
-                        auto_resize="true"
                         user_resize="false"
                         min_height="0"
                         top="0"
@@ -140,7 +136,6 @@
                             </text>
                             <slider
                                     can_edit_text="true"
-                                    auto_resize="true"
                                     decimal_digits="1"
                                     follows="top|left|right"
                                     layout="topleft"
@@ -215,7 +210,6 @@
                     </layout_stack>
                 </layout_panel>
                 <layout_panel
-                        auto_resize="true"
                         user_resize="false"
                         min_height="0"
                         top="0"
@@ -342,7 +336,7 @@
                                 enabled="false"
                                 top_delta="3"
                                 left_pad="21"
-                                xxxleft="-160"
+                                left="-160"
                                 height="20"
                                 layout="topleft"
                                 name="edt_invname_alt3"
@@ -462,7 +456,7 @@
                            enabled="false"
                            top_delta="-1"
                            left_pad="2"
-                           xxxleft="-160"
+                           left="-160"
                            height="20"
                            layout="topleft"
                            name="edt_invname_ground"
@@ -552,7 +546,6 @@
         </layout_panel>
         <!--
         <layout_panel 
-                auto_resize="false"
                 user_resize="false"
                 height="155"
                 min_height="0"
@@ -571,7 +564,6 @@
                         background_visible="true"
                         border="true"
                         bevel_style="in"
-                        auto_resize="true"
                         user_resize="false"
                         width="260"
                         min_width="260"
@@ -628,7 +620,6 @@
                             name="btn_select_inventory"
                             follows="top|left"
                             image_overlay="Command_Inventory_Icon"
-                            auto_resize="false"
                             layout="topleft"
                             height="20"
                             width="20"
@@ -648,7 +639,6 @@
                 <layout_panel 
                         border="true"
                         bevel_style="in"
-                        auto_resize="true"
                         user_resize="false"
                         width="260"
                         min_width="260"
@@ -738,7 +728,6 @@
             </layout_stack>
         </layout_panel>
         <layout_panel
-                auto_resize="false"
                 user_resize="false"
                 height="155"
                 min_height="0"
@@ -847,14 +836,12 @@
             </panel>
         </layout_panel>
         <layout_panel
-                auto_resize="true"
                 user_resize="false"
                 height="0"
                 min_height="0"
                 name="pnl_auto_adjust"
                 visible="true"/>
         <layout_panel
-                auto_resize="false"
                 user_resize="false"
                 height="59"
                 min_height="59"
-- 
cgit v1.2.3


From b81555d552ebfb2bcbb1f0eb282ad5cc6eb7077f Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 13 Jun 2019 14:51:10 +0300
Subject: SL-11420 FIXED [EEP] The fields next to 'Ground' and 'Sky4' are
 shifted to the right

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

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

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 b5be16db45..f2f2d73a06 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -45,8 +45,6 @@
                 name="pnl_environment_config"
                 visible="true">
             <layout_stack 
-                    width="530"
-                    height="367"
                     follows="all"
                     layout="topleft"
                     animate="false"
@@ -336,7 +334,6 @@
                                 enabled="false"
                                 top_delta="3"
                                 left_pad="21"
-                                left="-160"
                                 height="20"
                                 layout="topleft"
                                 name="edt_invname_alt3"
@@ -456,7 +453,6 @@
                            enabled="false"
                            top_delta="-1"
                            left_pad="2"
-                           left="-160"
                            height="20"
                            layout="topleft"
                            name="edt_invname_ground"
-- 
cgit v1.2.3


From 01bdbdb6acb4e315cb7de811d6ecced41fa0f9a7 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 10 Jul 2019 19:09:45 +0300
Subject: SL-11572 [EEP] Revert keyframe markers to dots

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 1b5bd90748..4332e0565b 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -244,7 +244,7 @@
                         <multi_slider
                                 decimal_digits="0"
                                 follows="bottom"
-                                height="12"
+                                height="10"
                                 increment="0.005"
                                 overlap_threshold="0.026"
                                 loop_overlap="true"
@@ -255,8 +255,6 @@
                                 max_val="1"
                                 name="WLDayCycleFrames"
                                 show_text="false"
-                                thumb_highlight_color="white"
-                                thumb_width="12"
                                 top_pad="15"
                                 width="525" />
 
-- 
cgit v1.2.3


From 92a54be1ff0b1ccdae6e6eb444f02e9d65046fcb Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 16 Jul 2019 18:14:43 +0300
Subject: SL-11598 Make internal view a perfect square to ensure identical x
 and y behavior

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 50d4c52a10..ac3b45d24c 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -123,7 +123,7 @@
             <xy_vector
                     follows="left|top"
                     name="cloud_scroll_xy"
-                    width="120"
+                    width="127"
                     height="145"
                     visible="true"
                     left_delta="0"
-- 
cgit v1.2.3


From e5879090a72cfb3139b6c6734f4a823ef54dfbf4 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 28 Aug 2019 11:17:01 +0300
Subject: SL-11795 Rename Load/Clone/Clear buttons

---
 .../skins/default/xui/en/floater_edit_ext_day_cycle.xml      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 4332e0565b..18ab69bd5e 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -287,24 +287,24 @@
                                 <button
                                         follows="top|left"
                                         height="23"
-                                        width="90"
-                                        label="Clone From"
+                                        width="110"
+                                        label="Clone Track From"
                                         left="10"
                                         top_pad="10"
                                         name="copy_track" />
                                 <button
                                         follows="top|left"
                                         height="23"
-                                        width="90"
-                                        label="Load From"
+                                        width="110"
+                                        label="Load Track From"
                                         top_pad="0"
                                         left_delta="0"
                                         name="load_track" />
                                 <button
                                         follows="top|left"
                                         height="23"
-                                        width="90"
-                                        label="Clear"
+                                        width="110"
+                                        label="Clear Track"
                                         top_pad="0"
                                         left_delta="0"
                                         name="clear_track" />
-- 
cgit v1.2.3


From 7a7f68fb3c09c187f5b6fd333d0292a3fbfbc9df Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 27 Sep 2019 16:58:54 +0300
Subject: SL-12024 [EEP] UI should indicate that the Environment tab is an
 estate-wide setting.

---
 .../newview/skins/default/xui/en/notifications.xml |  2 +-
 .../default/xui/en/panel_region_environment.xml    | 42 +++++++++++++++++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 228c50bb6d..35c51dbc52 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4896,7 +4896,7 @@ Unchecking this option may remove restrictions that parcel owners have added to
    icon="alertmodal.tga"
    name="EstateParcelEnvironmentOverride"
    type="alertmodal">
-Unchecking this option will remove any custom environments that parcel owners have added to their parcels. Please discuss with your parcel owners as needed.
+(Estate-wide change: [ESTATENAME]) Unchecking this option will remove any custom environments that parcel owners have added to their parcels. Please discuss with your parcel owners as needed.
 Do you wish to proceed?
     <tag>confirm</tag>
     <usetemplate
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 f2f2d73a06..bc0d59bcc7 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -19,11 +19,51 @@
     <string name="str_too_small">The parcel must be at least 128 square meters to support an environment.</string>
     <string name="str_empty">(empty)</string>
     <string name="str_region_env">(region environment)</string>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="32"
+      layout="topleft"
+      left="10"
+      name="env_help_text"
+      top="14"
+      word_wrap="true">
+       Changes to settings on this tab will affect all regions in the estate.
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     right="160"
+     name="estate_text"
+     top_pad="2"
+     halign="right"
+     width="140">
+        Estate:
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     top_delta="0"
+     name="estate_name"
+     left_pad="6"
+     width="150">
+        (unknown)
+    </text>
     <layout_stack 
             width="530"
-            height="367"
+            height="400"
             follows="all"
             layout="topleft"
+						left="0"
             animate="false"
             orientation="vertical">
         <layout_panel
-- 
cgit v1.2.3


From 7ff09d05f2023ce8eb26acc46da22f8d86743de5 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 7 Oct 2019 12:41:00 +0300
Subject: SL-12024 Remove 'Estate warning' message and show just region name
 instead

---
 .../default/xui/en/panel_region_environment.xml    | 70 ++++++++++------------
 1 file changed, 30 insertions(+), 40 deletions(-)

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

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 bc0d59bcc7..edf1e1efd4 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -19,53 +19,42 @@
     <string name="str_too_small">The parcel must be at least 128 square meters to support an environment.</string>
     <string name="str_empty">(empty)</string>
     <string name="str_region_env">(region environment)</string>
-    <text
-      type="string"
-      length="1"
-      follows="left|top"
-      height="32"
-      layout="topleft"
-      left="10"
-      name="env_help_text"
-      top="14"
-      word_wrap="true">
-       Changes to settings on this tab will affect all regions in the estate.
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     right="160"
-     name="estate_text"
-     top_pad="2"
-     halign="right"
-     width="140">
-        Estate:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     top_delta="0"
-     name="estate_name"
-     left_pad="6"
-     width="150">
-        (unknown)
-    </text>
+
     <layout_stack 
             width="530"
             height="400"
             follows="all"
             layout="topleft"
-						left="0"
+            left="0"
             animate="false"
             orientation="vertical">
+        <layout_panel
+                user_resize="false"
+                auto_resize="false"
+                height="20"
+                name="pnl_environment_region_msg"
+                top="0">
+            <text follows="left|top"
+                    font="SansSerif"
+                    height="20"
+                    layout="topleft"
+                    left="10"
+                    name="region_text_lbl"
+                    top="6"
+                    width="100">
+                Region:
+            </text>
+            <text follows="left|top"
+                    font="SansSerif"
+                    height="20"
+                    layout="topleft"
+                    left_delta="50"
+                    name="region_text"
+                    top_delta="0"
+                    width="400">
+                unknown
+            </text>
+        </layout_panel>
         <layout_panel
                 user_resize="false"
                 name="pnl_environment_disabled"
@@ -82,6 +71,7 @@
         <layout_panel
                 user_resize="false"
                 min_height="0"
+                top="0"
                 name="pnl_environment_config"
                 visible="true">
             <layout_stack 
-- 
cgit v1.2.3


From 7df0a4ddd0c48358e7152733aaba01464f2620be Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 14 Nov 2019 15:01:50 +0000
Subject: SL-10499, SL-10497 - use LLAgentBenefits info

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 7bb7b5d62c..165986448f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1306,7 +1306,7 @@
                  function="File.EnableUpload" />
                 <menu_item_call.on_visible
                  function="Upload.CalculateCosts"
-                 parameter="Upload Image" />
+                 parameter="Upload Image,texture" />
             </menu_item_call>
             <menu_item_call
              label="Sound (L$[COST])..."
@@ -1319,7 +1319,7 @@
                  function="File.EnableUpload" />
                 <menu_item_call.on_visible
                  function="Upload.CalculateCosts"
-                 parameter="Upload Sound" />
+                 parameter="Upload Sound,sound" />
             </menu_item_call>
             <menu_item_call
              label="Animation (L$[COST])..."
@@ -1332,7 +1332,7 @@
                  function="File.EnableUpload" />
                 <menu_item_call.on_visible
                  function="Upload.CalculateCosts"
-                 parameter="Upload Animation" />
+                 parameter="Upload Animation,animation" />
             </menu_item_call>
             <menu_item_call
            label="Model..."
@@ -1350,6 +1350,9 @@
              label="Bulk (L$[COST] per file)..."
              layout="topleft"
              name="Bulk Upload">
+                <menu_item_call.on_visible
+                 function="Upload.CalculateCosts"
+                 parameter="Bulk Upload,texture" />
                 <menu_item_call.on_click
                  function="File.UploadBulk"
                  parameter="" />
-- 
cgit v1.2.3


From 65550520ed00699098b221a1166e4c1763333d58 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 15 Nov 2019 15:13:11 +0000
Subject: SL-10499 - benefits. Removed no-longer-needed lleconomy files and
 classes. Group-related costs and limits via benefits.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f72767cceb..e0fc6bb9a5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -920,7 +920,7 @@ You do not have enough L$ to join this group.
    icon="alertmodal.tga"
    name="CreateGroupCost"
    type="alertmodal">
-Creating this group will cost L$100.
+Creating this group will cost L$[COST].
 Groups need more than one member, or they are deleted forever.
 Please invite members within 48 hours.
     <tag>group</tag>
@@ -929,7 +929,7 @@ Please invite members within 48 hours.
      canceltext="Cancel"
      name="okcancelbuttons"
      notext="Cancel"
-     yestext="Create group for L$100"/>
+     yestext="Create group for L$[COST]"/>
   </notification>
 
   <notification
-- 
cgit v1.2.3


From d12e10be377e692f5164ba914b8f038e66b0d45c Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 18 Nov 2019 17:15:11 +0000
Subject: SL-10499 - bulk upload behavior adjusted to account for possibly
 different upload prices for different asset types. Also added a confirmation
 dialog for bulk upload.

---
 indra/newview/skins/default/xui/en/menu_inventory_add.xml |  4 ++--
 indra/newview/skins/default/xui/en/menu_viewer.xml        |  2 +-
 indra/newview/skins/default/xui/en/notifications.xml      | 11 +++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

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

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 29724b0270..05dd8f827d 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -56,7 +56,7 @@
                 function="File.VisibleUploadModel"/>
                 </menu_item_call>
                 <menu_item_call
-                 label="Bulk (L$[COST] per file)..."
+                 label="Bulk..."
                  layout="topleft"
                  name="Bulk Upload">
                     <menu_item_call.on_click
@@ -253,4 +253,4 @@
                      parameter="eyes" />
                 </menu_item_call>
             </menu>
-</menu>
\ No newline at end of file
+</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 165986448f..9b27e8b03d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1347,7 +1347,7 @@
             function="File.VisibleUploadModel"/>
             </menu_item_call>
 	   <menu_item_call
-             label="Bulk (L$[COST] per file)..."
+             label="Bulk..."
              layout="topleft"
              name="Bulk Upload">
                 <menu_item_call.on_visible
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e0fc6bb9a5..2df0b1cbf4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8403,6 +8403,17 @@ Your voice has been muted by moderator.
          yestext="OK"/>
     </notification>
   
+   <notification
+    icon="alertmodal.tga"
+    name="BulkUploadCostConfirmation"
+    type="alertmodal">
+This will upload [COUNT] items at a total cost of L$[COST]. Do you wish to continue with the upload?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Upload"/>
+  </notification>
+
    <notification
     icon="alertmodal.tga"
     name="UploadCostConfirmation"
-- 
cgit v1.2.3


From eb6e64ec401382fd2fbbbb27830e828035a6e5af Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 19 Nov 2019 16:15:19 +0000
Subject: SL-10499 - Fixes for benefits info and upload, especially bulk upload

---
 indra/newview/skins/default/xui/en/menu_viewer.xml   | 2 +-
 indra/newview/skins/default/xui/en/notifications.xml | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 9b27e8b03d..362ddfd27a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1347,7 +1347,7 @@
             function="File.VisibleUploadModel"/>
             </menu_item_call>
 	   <menu_item_call
-             label="Bulk..."
+             labe="Bulk..."
              layout="topleft"
              name="Bulk Upload">
                 <menu_item_call.on_visible
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2df0b1cbf4..f93113ebd0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1289,6 +1289,14 @@ Error encoding snapshot.
     <tag>fail</tag>
   </notification>
   
+  <notification
+   icon="alertmodal.tga"
+   name="ErrorCannotAffordUpload"
+   type="alertmodal">
+    You need L$[COST] to upload this item.
+    <tag>fail</tag>
+  </notification>
+  
   <notification
    icon="alertmodal.tga"
    name="ErrorTextureCannotAfford"
-- 
cgit v1.2.3


From 4300b204f0fc519d3e2dabc7e1296284e5908611 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 20 Nov 2019 14:03:57 +0000
Subject: SL-10499 - handle package info from benefits service

---
 indra/newview/skins/default/xui/en/notifications.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f93113ebd0..c8db5d24dd 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8410,7 +8410,17 @@ Your voice has been muted by moderator.
          name="okbutton"
          yestext="OK"/>
     </notification>
-  
+
+    <notification
+        icon="alertmodal.tga"
+        name="FailedToGetBenefits"
+        type="alertmodal">
+      Unfortunately, we were unable to get benefits information for this session. This should not happen in a normal production environment. Please contact support. This session will not work normally and we recommend that you restart.
+      <usetemplate
+          name="okbutton"
+          yestext="OK"/>
+    </notification>
+
    <notification
     icon="alertmodal.tga"
     name="BulkUploadCostConfirmation"
-- 
cgit v1.2.3


From 4acfc99fa608269d06a5a3e45a4c3fdc5e3d06ee Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 22 Nov 2019 18:26:56 +0200
Subject: SL-12317 UI Changes to Group limits

---
 indra/newview/skins/default/xui/en/notifications.xml | 18 ++++++++++++++----
 indra/newview/skins/default/xui/en/panel_people.xml  |  3 ++-
 2 files changed, 16 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c8db5d24dd..670784f3bf 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4276,11 +4276,21 @@ You have reached your maximum number of groups. Please leave some group before j
    icon="alert.tga"
    name="GroupLimitInfo"
    type="alert">
-The group limit for base accounts is [MAX_BASIC], and for [https://secondlife.com/premium/ premium]
-accounts is [MAX_PREMIUM].
-If you downgraded your account, you will need to get below [MAX_BASIC] group limit before you can join more.
+Residents with Basic memberships may join up to [MAX_BASIC] groups.
+Premium memberships allow up to [MAX_PREMIUM]. [https://secondlife.com/my/account/membership.php? Learn more or upgrade]
+    <tag>group</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="Close"/>
+  </notification>
 
-[https://secondlife.com/my/account/membership.php Upgrade today!]
+  <notification
+   icon="alert.tga"
+   name="GroupLimitInfoPlus"
+   type="alert">
+Residents with Basic memberships may join up to [MAX_BASIC] groups.
+Premium memberships allow up to [MAX_PREMIUM]. Premium Plus
+memberships allow up to [MAX_PREMIUM_PLUS]. [https://secondlife.com/my/account/membership.php? Learn more or upgrade]
     <tag>group</tag>
     <usetemplate
      name="okbutton"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index a47121ae99..c4248d9b92 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -55,7 +55,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 	 value="[REGION](Double-click to teleport, shift-drag to pan)"/>
 	<string
 	 name="GroupCountWithInfo"
-	 value="You belong to [COUNT] groups, and can join [REMAINING] more.  [secondlife:/// Want more?]"/>
+	 value="You belong to [COUNT] groups, and can join [REMAINING] more.  [secondlife:/// Raise your limit]"/>
     <tab_container
      bottom="-10"
      follows="all"
@@ -493,6 +493,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                 top_pad="4"
                 left="3"
                 use_ellipses="true"
+                skip_link_underline="true"
                 name="groupcount">
               You belong to [COUNT] groups, and can join [REMAINING] more.
             </text>
-- 
cgit v1.2.3


From 9621dd8bbd1697b119574bcc879345f03b42969e Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 22 Nov 2019 20:18:30 +0200
Subject: SL-12100 Premium Enhancements - Changes to rates to create Groups, UI
 Work

---
 .../skins/default/xui/en/floater_people.xml        |   6 +
 .../newview/skins/default/xui/en/notifications.xml |  12 +
 .../xui/en/panel_group_creation_sidetray.xml       | 314 +++++++++++++++++++++
 .../default/xui/en/panel_group_info_sidetray.xml   |  11 -
 indra/newview/skins/default/xui/en/strings.xml     |   6 +
 5 files changed, 338 insertions(+), 11 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
index 701233ba4a..0cc0ca1ce4 100644
--- a/indra/newview/skins/default/xui/en/floater_people.xml
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -31,5 +31,11 @@
         filename="panel_group_info_sidetray.xml"
         label="Group Profile"
         font="SansSerifBold"/>
+      <panel
+        class="panel_group_creation_sidetray"
+        name="panel_group_creation_sidetray"
+        filename="panel_group_creation_sidetray.xml"
+        label="Create Group"
+        font="SansSerifBold"/>
     </panel_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 670784f3bf..2417c52251 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -684,6 +684,18 @@ Do you want to revoke modify rights for the selected Residents?
      yestext="Yes"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="GroupNameLengthWarning"
+   type="alertmodal">
+A group name must be between [MIN_LEN] and [MAX_LEN] characters.
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate
+       name="okbutton"
+       yestext="OK"/>
+  </notification>
+  
   <notification
    icon="alertmodal.tga"
    name="UnableToCreateGroup"
diff --git a/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml
new file mode 100644
index 0000000000..c0265c2fa2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+background_visible="true"
+ follows="all"
+ height="570"
+ label="Group Creation"
+ layout="topleft"
+ min_height="350"
+ left="0"
+ top="20"
+ name="GroupCreation"
+ width="313">
+  <panel.string
+   name="current_membership">
+(your membership)
+  </panel.string>
+  <panel
+    name="group_info_top"
+    follows="top|left"
+    top="0"
+    left="0"
+    height="29"
+    width="313"
+    layout="topleft">
+    <line_editor
+     follows="left|top"
+     font="SansSerif"
+     label="Type your new group name here"
+     layout="topleft"
+     max_length_bytes="35"
+     name="group_name_editor"
+     left="12"
+     top="5"
+     width="270"
+     height="20"
+     visible="true" />
+  </panel>
+  <layout_stack
+    name="layout"
+    orientation="vertical"
+     follows="all"
+    left="8"
+    top_pad="0"
+    height="538"
+    width="300"
+    border_size="0">
+    <layout_panel
+        bg_alpha_color="DkGray2"
+        bg_opaque_color="DkGray2"
+        background_visible="true"
+        background_opaque="true"
+        name="group_info"
+        follows="all"
+        layout="topleft"
+        auto_resize="false"
+        user_resize="false"
+        height="206"
+        width="313">
+      <panel
+         name="group_info_top"
+         follows="top|left|right"
+         top="0"
+         left="0"
+         height="99"
+         width="312"
+         layout="topleft">
+        <texture_picker
+         default_image_name="Generic_Group_Large"
+         follows="left|top"
+         name="insignia"
+         label=""
+         no_commit_on_selection="true"
+         tool_tip="Click to choose a picture"
+         layout="topleft"
+         height="110"
+         left="5"
+         top="5"
+         width="100" />
+        <text_editor
+         follows="left|top|right"
+         layout="topleft"
+         type="string"
+         name="charter"
+         left_pad="3"
+         height="86"
+         max_length="511"
+         top="6"
+         right="-4"
+         bg_readonly_color="DkGray2"
+         text_readonly_color="White"
+         word_wrap="true">
+          Group Charter
+        </text_editor>
+      </panel>
+      <panel
+            layout="topleft"
+            follows="left|top|right"
+            background_visible="false"
+            bevel_style="none"
+            border="false"
+            bg_alpha_color="FloaterUnfocusBorderColor"
+            height="100"
+            width="313"
+            left="0"
+            name="preferences_container"
+            top_pad="5">
+        <check_box
+         follows="right|top|left"
+         layout="topleft"
+         label="Anyone can join"
+         height="16"
+         left="10"
+         name="open_enrollement"
+         tool_tip="Sets whether this group allows new members to join without being invited."
+         width="90" />
+        <check_box
+         label="Cost to join"
+         layout="topleft"
+         name="check_enrollment_fee"
+         tool_tip="Sets whether to require an enrollment fee to join the group"
+         top_pad="5"
+         left_delta="0"
+         height="16"
+         width="300" />
+        <spinner
+         decimal_digits="0"
+         follows="left|top"
+         halign="left"
+         increment="1"
+         label_width="15"
+         label="L$"
+         layout="topleft"
+         max_val="99999"
+         height="23"
+         left="30"
+         name="spin_enrollment_fee"
+         tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."
+         width="170" />
+        <combo_box
+         follows="left|top"
+         layout="topleft"
+         name="group_mature_check"
+         tool_tip="Maturity ratings designate the type of content and behavior allowed in a group"
+         height="23"
+         left="10"
+         top_pad="4"
+         width="190">
+          <combo_item name="select_mature" value="Select">
+            - Select maturity rating -
+          </combo_item>
+          <combo_box.item
+           label="Moderate Content"
+           name="mature"
+           value="Mature" />
+          <combo_box.item
+           label="General Content"
+           name="pg"
+           value="Not Mature" />
+        </combo_box>
+      </panel>
+    </layout_panel>
+    <layout_panel
+      background_visible="false"
+      background_opaque="true"
+      name="create_info"
+      follows="all"
+      layout="topleft"
+      auto_resize="false"
+      user_resize="false"
+      height="200"
+      width="313">
+      <text
+        font="SansSerifSmall"
+        follows="top|left|right"
+        layout="topleft"
+        mouse_opaque="false"
+        type="string"
+        name="fee_information"
+        skip_link_underline="true"
+        height="26"
+        left="8"
+        right="-8"
+        top="5"
+        word_wrap="true">
+        The fee to create a group is based on your membership level. [https://secondlife.com/my/account/membership.php More info]
+      </text>
+      <scroll_list
+        draw_border="false"
+        background_visible="false"
+        follows="left|top|bottom|right"
+        layout="topleft"
+        multi_select="true"
+        name="membership_list"
+        row_padding="4"
+        enabled="false"
+        height="150"
+        left="2"
+        top_pad="8"
+        width="290">
+        <scroll_list.columns
+          dynamic_width="false"
+          name="clmn_name"
+          width="220"/>
+        <scroll_list.columns
+          dynamic_width="true"
+          name="clmn_price"/>
+        <scroll_list.rows
+          name="basic"
+          value="Basic (placeholder)"/>
+        <scroll_list.rows
+          name="plc2"
+          value="" />
+        <scroll_list.rows
+          name="premium"
+          value="Premium (placeholder)" />
+      </scroll_list>
+    </layout_panel>
+    <layout_panel
+      background_visible="false"
+      background_opaque="true"
+      name="create_actions"
+      follows="all"
+      layout="topleft"
+      auto_resize="true"
+      user_resize="true"
+      height="200"
+      width="313">
+    </layout_panel>
+    <layout_panel
+      background_visible="false"
+      background_opaque="true"
+      name="create_actions"
+      follows="all"
+      layout="topleft"
+      auto_resize="false"
+      user_resize="false"
+      height="75"
+      width="313">
+
+      <layout_stack
+        follows="bottom|left|right"
+        layout="topleft"
+        name="button_row_ls"
+        left="1"
+        right="-1"
+        orientation="horizontal"
+        height="25"
+        top="1">
+        <layout_panel
+          follows="bottom|left|right"
+          layout="bottomleft"
+          name="layout_crt"
+          auto_resize="true"
+          height="23"
+          width="91">
+          <!-- placeholder to autoadjust buttons (since they are of different sizes)-->
+        </layout_panel>
+        <layout_panel
+          follows="bottom|left|right"
+          layout="bottomleft"
+          name="layout_crt"
+          auto_resize="false"
+          height="23"
+          width="245">
+          <button
+            follows="bottom|left|right"
+            layout="topleft"
+            label="Create group for L$ [COST]"
+            name="btn_create"
+            visible="true"
+            tool_tip="Create a new Group"
+            height="23"
+            left="1"
+            top="0"
+            width="160" />
+          <button
+            follows="bottom|left|right"
+            name="back"
+            label="Cancel"
+            layout="topleft"
+            tool_tip="Return to list of groups"
+            left_pad="13"
+            height="23"
+            top="0"
+            width="70" />
+        </layout_panel>
+        <layout_panel
+          follows="bottom|left|right"
+          layout="bottomleft"
+          name="layout_crt"
+          auto_resize="true"
+          height="23"
+          width="91">
+          <!-- placeholder to autoadjust buttons-->
+        </layout_panel>
+      </layout_stack>
+      <text
+        font="SansSerifSmall"
+        follows="top|left|right"
+        layout="topleft"
+        mouse_opaque="false"
+        type="string"
+        height="26"
+        left="6"
+        right="-6"
+        name="info_deletion"
+        top_pad="8"
+        word_wrap="true"
+        halign="center">
+        Note: After 7 days, a group with no members (other than the creator) is deleted
+      </text>
+    </layout_panel>
+  </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 95312edfb9..05de249d22 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -280,17 +280,6 @@ background_visible="true"
 				     left="1"
 				     top="0"
 				     width="90" />
-					<button
-    				 follows="bottom|left|right"
-	                 height="23"
-	                 layout="topleft"
-	                 left="1"
-	                 top="0"
-	                 label="Create Group"
-     				 name="btn_create"
-               		 visible="true"
-                 	 tool_tip="Create a new Group"
-                 	 width="90" />	
 				</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 9eedc45aa9..942fb925b5 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3934,6 +3934,12 @@ Please check http://status.secondlifegrid.net to see if there is a known problem
   <string name="Accounting">Accounting</string>
   <string name="Notices">Notices</string>
   <string name="Chat">Chat</string>
+  
+  <!-- SL Membership -->
+  <string name="BaseMembership">Base</string>
+  <string name="PremiumMembership">Premium</string>
+  <string name="PremiumPlusMembership">Premium Plus</string>
+  <string name="InternalMembership">Internal</string> <!-- No need to translate -->
 
   <!-- Question strings for delete items notifications -->
   <string name="DeleteItems">Delete selected items?</string>
-- 
cgit v1.2.3


From f1a6e776b41f15ffc0ed4cf245136143bcd1a852 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 25 Nov 2019 22:52:07 +0200
Subject: SL-12097, SL-12098, SL-12099 UI update for Texture, Animation and
 Sound upload fees

---
 .../default/xui/en/floater_animation_anim_preview.xml | 19 ++++++++++++++++---
 .../default/xui/en/floater_animation_bvh_preview.xml  | 15 ++++++++++++++-
 .../skins/default/xui/en/floater_image_preview.xml    | 15 ++++++++++++++-
 .../skins/default/xui/en/floater_sound_preview.xml    | 19 ++++++++++++++++---
 indra/newview/skins/default/xui/en/strings.xml        |  2 ++
 5 files changed, 62 insertions(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
index b5538a511c..c4ffba33fd 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="190"
+ height="180"
  layout="topleft"
  name="Anim Preview"
  help_topic="animation_anim_preview"
@@ -60,9 +60,9 @@
      height="22"
      label="Upload (L$[AMOUNT])"
      layout="topleft"
-     left="45"
+     left="35"
      name="ok_btn"
-     top_pad="60"
+     top_pad="15"
      width="150" />
     <button
      follows="right|bottom"
@@ -73,4 +73,17 @@
      name="cancel_btn"
      left_pad="5"
      width="90" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="35"
+     layout="topleft"
+     left="10"
+     mouse_opaque="false"
+     skip_link_underline="true"
+     name="info_text"
+     word_wrap="true"
+     top_pad="10"
+     width="270"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
index cb6b2f6ebc..0c62bfe304 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_minimize="false"
- height="610"
+ height="645"
  layout="topleft"
  name="Animation Preview"
  help_topic="animation_preview"
@@ -570,4 +570,17 @@ We recommend BVH files exported from Poser 4.
      name="cancel_btn"
      left="142"
      width="128" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="35"
+     layout="topleft"
+     left="10"
+     mouse_opaque="false"
+     skip_link_underline="true"
+     name="info_text"
+     word_wrap="true"
+     top_pad="10"
+     width="270"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml
index 44d2c14cc8..3daff1a132 100644
--- a/indra/newview/skins/default/xui/en/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_minimize="false"
- height="460"
+ height="495"
  layout="topleft"
  name="Image Preview"
  help_topic="image_preview"
@@ -148,4 +148,17 @@ Try saving image as 24 bit Targa (.tga).
      name="ok_btn"
      top_delta="0"
      width="125" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="35"
+     layout="topleft"
+     left="10"
+     mouse_opaque="false"
+     skip_link_underline="true"
+     name="info_text"
+     word_wrap="true"
+     top_pad="10"
+     width="270"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_sound_preview.xml b/indra/newview/skins/default/xui/en/floater_sound_preview.xml
index af791466b6..3889b975a9 100644
--- a/indra/newview/skins/default/xui/en/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_sound_preview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="190"
+ height="180"
  layout="topleft"
  name="Sound Preview"
  help_topic="sound_preview"
@@ -60,9 +60,9 @@
      height="22"
      label="Upload (L$[AMOUNT])"
      layout="topleft"
-     left="45"
+     left="35"
      name="ok_btn"
-     top_pad="60"
+     top_pad="15"
      width="150" />
     <button
      follows="right|bottom"
@@ -73,4 +73,17 @@
      name="cancel_btn"
      left_pad="5"
      width="90" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="35"
+     layout="topleft"
+     left="10"
+     mouse_opaque="false"
+     skip_link_underline="true"
+     name="info_text"
+     word_wrap="true"
+     top_pad="10"
+     width="270"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 942fb925b5..543edccad8 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2365,6 +2365,8 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="MarketplaceNoStock">out of stock</string>
 	<string name="MarketplaceUpdating">updating...</string>
 
+	<string name="UploadFeeInfo">Fee is based on your subscription level. Higher levels are charged lower fees. [https://secondlife.com/my/account/membership.php? Learn more]</string>
+
 	<string name="Open landmarks">Open landmarks</string>
   <string name="Unconstrained">Unconstrained</string>
 
-- 
cgit v1.2.3


From d0abb6e1e091e89186df1d1fe6c8256f0bac497c Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 26 Nov 2019 17:15:42 +0000
Subject: SL-12100, SL-12317 - benefits handling fixes

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 543edccad8..d2019c23ed 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3940,7 +3940,7 @@ Please check http://status.secondlifegrid.net to see if there is a known problem
   <!-- SL Membership -->
   <string name="BaseMembership">Base</string>
   <string name="PremiumMembership">Premium</string>
-  <string name="PremiumPlusMembership">Premium Plus</string>
+  <string name="Premium PlusMembership">Premium Plus</string>
   <string name="InternalMembership">Internal</string> <!-- No need to translate -->
 
   <!-- Question strings for delete items notifications -->
-- 
cgit v1.2.3


From bed0e63f1bbdb08d0d63de522504d3df6549e445 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 9 Dec 2019 17:52:41 +0200
Subject: SL-12414 The "Bulk" upload warning message for .bhv files is
 confusing

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2417c52251..a5396a5454 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8452,6 +8452,26 @@ This will upload [COUNT] items at a total cost of L$[COST]. Do you wish to conti
      name="okcancelbuttons"
      notext="Cancel"
      yestext="Upload"/>
+   </notification>
+  
+   <notification
+    icon="alertmodal.tga"
+    name="BulkUploadNoCompatibleFiles"
+    type="alertmodal">
+Selected files can not be bulk-uploaded.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+   </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BulkUploadIncompatibleFiles"
+   type="alertmodal">
+Some of the selected files can not be bulk-uploaded.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
   </notification>
 
    <notification
-- 
cgit v1.2.3


From 061a70a0d4f26e3d651d679d470e28c925c5b7cc Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 14 Jan 2020 20:01:40 +0200
Subject: SL-12513 Fixed 'Bake' radiobutton (merge issue)

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 21425b21be..ee313c65f5 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -64,7 +64,7 @@
          height="16" 
          left="0" 
          value="0"
-         width="80" />
+         width="70" />
         <radio_item
          label="Local"
          left_pad="0"
@@ -73,7 +73,7 @@
          height="16" 
          name="local"
          value="1"
-         width="75" />
+         width="50" />
        <radio_item
          label="Bake"
          left_pad="0"
-- 
cgit v1.2.3


From b1b5075dab486b02c0bcbdf73fd9b4bd9b30c7b0 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 15 Jan 2020 17:31:47 +0200
Subject: SL-12303 [EEP] Texture size information overlaps the border of the
 Texture picker

---
 .../skins/default/xui/en/floater_texture_ctrl.xml  | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index ee313c65f5..a52d0a95d6 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -92,12 +92,23 @@
      follows="left|top"
      height="14"
      layout="topleft"
-     left_delta="-12"
+     left_delta="12"
+     name="size_lbl"
+     top_pad="4">
+        Size:
+    </text>
+
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="14"
+     layout="topleft"
+     left_delta="0"
      name="unknown"
      top_pad="4">
-        Size: [DIMENSIONS]
+        [DIMENSIONS]
     </text>
-    
 <!--  middle: inventory mode -->
 
     <button
@@ -139,19 +150,20 @@
      image_unselected="eye_button_inactive.tga"
      layout="topleft"
      left_delta="-80"
-     top_delta="-25"
+     top_delta="-10"
      name="Pipette"
      width="28" />
    <text
      follows="left|bottom"
-     height="20"
+     height="40"
      layout="topleft"
      left="8"
      name="preview_disabled"
-     top="266"
+     top="285"
      value="Preview Disabled"
+     word_wrap="true"
      visible="false"
-     width="120" />
+     width="87" />
     <filter_editor
      follows="left|top|right"
      height="23"
-- 
cgit v1.2.3


From 28633bd159b072a0bc0ecfbb62b9f9d9c4cbe246 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 16 Jan 2020 14:45:26 +0000
Subject: SL-12569 - Fixed more places where texture upload cost was hardcoded
 in UI

---
 indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml        | 2 +-
 indra/newview/skins/default/xui/en/menu_outfit_gear.xml               | 2 +-
 .../newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
index 1b08767edc..99ca910062 100755
--- a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
@@ -42,7 +42,7 @@
         parameter="take_off" />
     </menu_item_call>
     <menu_item_call
-        label="Upload Photo (L$10)"
+        label="Upload Photo (L$[UPLOAD_COST])"
         layout="topleft"
         name="upload_photo">
         <on_click
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index 61cb74f230..32d9d28434 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -40,7 +40,7 @@
          parameter="take_off" />
     </menu_item_call>
     <menu_item_call
-     label="Upload Photo (L$10)"
+     label="Upload Photo (L$[UPLOAD_COST])"
      layout="topleft"
      name="upload_photo">
         <on_click
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
index 800faabc2a..ace0ee01e2 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
@@ -67,7 +67,7 @@
     <button
      follows="left|bottom"
      height="23"
-     label="UPLOAD L$10"
+     label="UPLOAD L$[UPLOAD_COST]"
      layout="topleft"
      left="10"
      name="save_btn"
@@ -76,4 +76,4 @@
       <button.commit_callback
        function="Inventory.SaveOutfitPhoto" />
     </button>
-</panel>
\ No newline at end of file
+</panel>
-- 
cgit v1.2.3


From 195f69f603613c3270050169c6a42f84307f8163 Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Fri, 24 Jan 2020 16:45:36 -0700
Subject: SL-12594, remove the Basic Shaders checkbox from the gui

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 70bf3f7c14..f06377f51a 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -623,6 +623,7 @@
     top_delta="16"
     width="300" />
 
+  <!-- SL-12594, basic shaders always enabled  
   <check_box
     control_name="VertexShaderEnable"
     height="16"
@@ -637,7 +638,8 @@
     <check_box.commit_callback
       function="Pref.VertexShaderEnable" />
   </check_box>
-
+  -->
+    
   <slider
     control_name="RenderTerrainDetail"
     follows="left|top"
-- 
cgit v1.2.3


From a20a506bd1a281fe5d0d54c9a59c47abed23d44a Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Wed, 29 Jan 2020 13:18:41 -0700
Subject: SL-12594, rename some lingering VertexShaderEnable variables

---
 .../default/xui/en/floater_preferences_graphics_advanced.xml | 12 ++++++------
 .../skins/default/xui/en/panel_preferences_graphics1.xml     |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index f06377f51a..ce219069e7 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -609,7 +609,7 @@
     top_delta="16"
     width="300">
     <check_box.commit_callback
-      function="Pref.VertexShaderEnable" />
+      function="Pref.RenderOptionUpdate" />
   </check_box>
 
   <check_box
@@ -685,7 +685,7 @@
     top_delta="16"
     width="280">
     <check_box.commit_callback
-      function="Pref.VertexShaderEnable" />
+      function="Pref.RenderOptionUpdate" />
   </check_box>
 
   <check_box
@@ -753,7 +753,7 @@
     top_delta="16"
     width="280">
     <check_box.commit_callback
-      function="Pref.VertexShaderEnable" />
+      function="Pref.RenderOptionUpdate" />
   </check_box>
 
   <slider
@@ -802,7 +802,7 @@
     top_delta="16"
     width="260">
     <check_box.commit_callback
-      function="Pref.VertexShaderEnable" />
+      function="Pref.RenderOptionUpdate" />
   </check_box>
 
   <check_box
@@ -816,7 +816,7 @@
     top_delta="16"
     width="240">
     <check_box.commit_callback
-      function="Pref.VertexShaderEnable" />
+      function="Pref.RenderOptionUpdate" />
   </check_box>
 
   <check_box
@@ -830,7 +830,7 @@
     top_delta="16"
     width="240">
     <check_box.commit_callback
-      function="Pref.VertexShaderEnable" />
+      function="Pref.RenderOptionUpdate" />
   </check_box>
 
   <!--
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 4692a226d9..4d9152e9a5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -242,7 +242,7 @@
     top_delta="24"
     width="280">
     <check_box.commit_callback
-      function="Pref.VertexShaderEnable" />
+      function="Pref.RenderOptionUpdate" />
   </check_box>
 
   <check_box
@@ -256,7 +256,7 @@
     top_delta="24"
     width="256">
     <check_box.commit_callback
-      function="Pref.VertexShaderEnable" />
+      function="Pref.RenderOptionUpdate" />
   </check_box>
   
   <slider
-- 
cgit v1.2.3


From c3ad61034c8ee8054f83daf4db07fc05f0898d17 Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Wed, 29 Jan 2020 14:45:37 -0700
Subject: SL-12594, remove settings-file references to VertexShaderEnable

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index ce219069e7..e93568a87e 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -623,7 +623,7 @@
     top_delta="16"
     width="300" />
 
-  <!-- SL-12594, basic shaders always enabled  
+  <!-- SL-12594, basic shaders always enabled, no fixed-function GL 
   <check_box
     control_name="VertexShaderEnable"
     height="16"
-- 
cgit v1.2.3


From 01d4fd2451f6ba2f4f17c7fbf0f9511d37b20e21 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 19 Feb 2020 21:20:22 +0200
Subject: SL-12726 Fixed overlap issues in Edit Day Cycle floater

Multiline support for current time, space for correct wrap; Fixed text getting out of bonds for labels; Space from time_label was not working;
---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  | 37 +++++++++++-----------
 1 file changed, 19 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 18ab69bd5e..6869eefda2 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -19,7 +19,7 @@
     <string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string>
 
     <!-- Substitutions -->
-    <string name="time_label"> ([HH]:[MM])</string>
+    <string name="time_label">([HH]:[MM])</string>
     <string name="sky_track_label">Sky [ALT]</string>
     <string name="sky_label">Sky</string>
     <string name="water_label">Water</string>
@@ -185,44 +185,44 @@
                                 left="10"
                                 name="p0"
                                 top_pad="5"
-                                value="0%[DSC]"
-                                width="80" />
+                                value="0% [DSC]"
+                                width="90" />
                         <text
                                 follows="left|top|right"
                                 height="15"
                                 layout="topleft"
-                                left_pad="37"
+                                left_delta="117"
                                 name="p1"
                                 top_delta="0"
-                                value="25%[DSC]"
-                                width="80" />
+                                value="25% [DSC]"
+                                width="90" />
                         <text
                                 follows="left|top|right"
                                 height="15"
                                 layout="topleft"
-                                left_pad="42"
+                                left_delta="122"
                                 name="p2"
                                 top_delta="0"
-                                value="50%[DSC]"
-                                width="80" />
+                                value="50% [DSC]"
+                                width="90" />
                         <text
                                 follows="left|top|right"
                                 height="15"
                                 layout="topleft"
-                                left_pad="42"
+                                left_delta="122"
                                 name="p3"
                                 top_delta="0"
-                                value="75%[DSC]"
-                                width="80" />
+                                value="75% [DSC]"
+                                width="90" />
                         <text
                                 follows="left|top|right"
                                 height="15"
                                 layout="topleft"
-                                left_pad="42"
+                                left_delta="122"
                                 name="p4"
                                 top_delta="0"
-                                value="100%[DSC]"
-                                width="80" />
+                                value="100% [DSC]"
+                                width="90" />
                         <multi_slider
                                 decimal_digits="0"
                                 draw_track="false"
@@ -260,13 +260,14 @@
 
                         <text
                                 follows="left|bottom"
-                                height="20"
+                                height="30"
                                 layout="topleft"
                                 left_pad="0"
                                 name="current_time"
-                                value="[PRCNT]%[DSC]"
+                                value="[PRCNT]% [DSC]"
                                 top_delta="-5"
-                                width="70" />
+                                width="56"
+                                word_wrap="true"/>
 
                         <layout_stack
                                 follows="all"
-- 
cgit v1.2.3


From b1934b4d05f5d044584b5eb7115639bf1183aa93 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Feb 2020 20:23:12 +0200
Subject: SL-12755 [EEP] The sky level dropdown was not disabled by default

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 132d23492f..c6136904cf 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -107,6 +107,7 @@
              max_chars="100"
              mouse_opaque="true"
              name="track_selection"
+             enabled="false"
              top="1"
              width="190"/>
         </layout_panel>
-- 
cgit v1.2.3


From dbf464e0fd0df27c18b78a77004b40a8477e0c31 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Feb 2020 20:43:15 +0200
Subject: SL-12754 Fixed search field

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index c6136904cf..3a26c3b547 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -58,7 +58,7 @@
             <filter_editor
                     follows="left|top|right"
                     height="23"
-                    label="Filter Textures"
+                    label="Filter Settings"
                     layout="topleft"
                     left="4"
                     name="flt_inventory_search"
@@ -69,7 +69,7 @@
               follows="all"
               layout="topleft"
               left="2"
-              top="2"
+              top="28"
               right="-2"
               bottom="-2"
               background_visible="true"
@@ -83,6 +83,7 @@
                     bg_alpha_color="DkGray2"
                     border="false"
                     follows="all"
+                    layout="topleft"
                     left_delta="0"
                     name="pnl_inventory"
                     top="1"
-- 
cgit v1.2.3


From e4a8942843316b6b4f9a88a280596c9311d88a53 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 25 Feb 2020 18:56:11 +0000
Subject: SL-12757 - typo in menu_viewer.xml

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b1d44302f9..2c9bf99fe2 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1337,7 +1337,7 @@
             function="File.VisibleUploadModel"/>
             </menu_item_call>
 	   <menu_item_call
-             labe="Bulk..."
+             label="Bulk..."
              layout="topleft"
              name="Bulk Upload">
                 <menu_item_call.on_visible
-- 
cgit v1.2.3


From 3f96aeff8c84e55164ce5d652e38041b4e1db82b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 10 Mar 2020 16:33:55 +0200
Subject: SL-12817 New text for snapshot upload

---
 .../default/xui/en/panel_outfit_snapshot_inventory.xml     |  6 ++++--
 .../skins/default/xui/en/panel_snapshot_inventory.xml      |  2 +-
 .../skins/default/xui/en/panel_snapshot_options.xml        | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
index ace0ee01e2..441cf97e87 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
@@ -41,7 +41,7 @@
     <text
      follows="top|left"
      font="SansSerif"
-     height="56"
+     height="126"
      layout="topleft"
      left="10"
      length="1"
@@ -50,7 +50,9 @@
      width="200"
      type="string"
      word_wrap="true">
-        Uploading an image to your inventory costs L$[UPLOAD_COST].
+Uploading an image to your inventory costs L$[UPLOAD_COST].
+
+Fee is based on your subscription level. Higher levels are charged lower fees.
     </text>
     <button
      follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index d019a0a310..8cc27d9eef 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -118,7 +118,7 @@
      width="200"
      type="string"
      word_wrap="true">
-        Saving an image to your inventory costs L$[UPLOAD_COST]. To save your image as a texture select one of the square formats.
+        To save your image as a texture select one of the square formats.
     </text>
     <button
      follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index 2fe4cf8183..8fc5cd7e63 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -73,4 +73,18 @@
     <button.commit_callback
      function="Snapshot.SaveToEmail" />
   </button>
+  <text
+   follows="top|left"
+   font="SansSerif"
+   height="56"
+   layout="topleft"
+   left="10"
+   length="1"
+   name="fee_hint_lbl"
+   top_pad="7"
+   width="200"
+   type="string"
+   word_wrap="true">
+    Fee is based on your subscription level. Higher levels are charged lower fees.
+  </text>
 </panel>
\ No newline at end of file
-- 
cgit v1.2.3


From 13c8496799581ad88d4ef1f1dd84bcbf331edb5b Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 10 Mar 2020 23:29:32 +0200
Subject: SL-12779 [EEP] Fix for cropped buttons in 'Edit Day Cycle' floater

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 6869eefda2..30e9002230 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -260,7 +260,7 @@
 
                         <text
                                 follows="left|bottom"
-                                height="30"
+                                height="25"
                                 layout="topleft"
                                 left_pad="0"
                                 name="current_time"
@@ -273,7 +273,7 @@
                                 follows="all"
                                 height="200"
                                 animate="false"
-                                top_pad="5"
+                                top_pad="0"
                                 left="0"
                                 orientation="horizontal">
                             <layout_panel
-- 
cgit v1.2.3