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.

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

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

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>
-- 
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/menu_save_settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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.

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

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

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" />
-- 
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/menu_save_settings.xml')

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

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

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

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