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')

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')

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')

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')

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')

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')

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