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

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