From 985b7277e824c39275d9a06c6262b6f394b02133 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Mon, 8 Apr 2013 17:10:46 -0400
Subject: WIP SH-4035: confirmation when closing appearance window when changes
 present

---
 indra/newview/skins/default/xui/en/notifications.xml | 13 +++++++++++++
 1 file changed, 13 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 105bef7321..2170283af2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10030,5 +10030,18 @@ Cannot create large prims that intersect other players.  Please re-try when othe
      name="okignore"
      yestext="OK"/>
   </notification>
+
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmExitWithoutSave"
+   type="alertmodal">
+    Closing this window will discard any changes you have made.
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
   
 </notifications>
-- 
cgit v1.2.3


From 2798c355c441f8d92a02537eca6e253c8fbf2bc4 Mon Sep 17 00:00:00 2001
From: "prep@lindenlab.com" <prep@lindenlab.com>
Date: Wed, 10 Apr 2013 16:53:46 -0500
Subject: SH-4035:Added ignore message to notification

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

(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 2170283af2..1ff63c6def 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10039,9 +10039,10 @@ Cannot create large prims that intersect other players.  Please re-try when othe
     Closing this window will discard any changes you have made.
     <tag>confirm</tag>
     <usetemplate
-     name="okcancelbuttons"
+     name="okcancelignore"
      notext="Cancel"
-     yestext="OK"/>
+     yestext="OK"
+     ignoretext="Don't show me this again."/>
   </notification>
-  
+
 </notifications>
-- 
cgit v1.2.3


From c498f53d9ab02a41886b55762883d116801fd39b Mon Sep 17 00:00:00 2001
From: "prep@lindenlab.com" <prep@lindenlab.com>
Date: Tue, 28 May 2013 11:51:11 -0500
Subject: Sh-4035: Updated implementation according to new specs. Fixed a
 couple of outstanding bugs.

---
 .../newview/skins/default/xui/en/notifications.xml | 30 ++++++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

(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 07c8ecc4dd..860dabdcc8 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10118,13 +10118,33 @@ Cannot create large prims that intersect other players.  Please re-try when othe
    icon="alertmodal.tga"
    name="ConfirmExitWithoutSave"
    type="alertmodal">
-    Closing this window will discard any changes you have made.
+    You have not saved the changes to your outfit. Would you like to save it now?
     <tag>confirm</tag>
     <usetemplate
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"
-     ignoretext="Don't show me this again."/>
+     name="yesnocancelbuttons"
+     notext="Revert"
+     yestext="Yes"
+     canceltext="Dismiss"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Save Outfit"
+   name="SaveOutfitEither"
+   type="alertmodal">
+    <unique/>
+    Save outfit (defaults to current outfit):
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" type="text">
+        [DESC]
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="Save"/>     
+    </form>
   </notification>
 
 </notifications>
-- 
cgit v1.2.3


From 8c35b1b58bad66bfb5302e598536c0262263cbcb Mon Sep 17 00:00:00 2001
From: "prep@lindenlab.com" <prep@lindenlab.com>
Date: Fri, 14 Jun 2013 12:34:45 -0500
Subject: WIP: sh-4035 backed out changes to appearance window confirmation

---
 .../newview/skins/default/xui/en/notifications.xml | 34 +---------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

(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 860dabdcc8..c3d8a528c5 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10114,37 +10114,5 @@ Cannot create large prims that intersect other players.  Please re-try when othe
   </notification>
 
 
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmExitWithoutSave"
-   type="alertmodal">
-    You have not saved the changes to your outfit. Would you like to save it now?
-    <tag>confirm</tag>
-    <usetemplate
-     name="yesnocancelbuttons"
-     notext="Revert"
-     yestext="Yes"
-     canceltext="Dismiss"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Save Outfit"
-   name="SaveOutfitEither"
-   type="alertmodal">
-    <unique/>
-    Save outfit (defaults to current outfit):
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message" type="text">
-        [DESC]
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="Save"/>     
-    </form>
-  </notification>
-
+ 
 </notifications>
-- 
cgit v1.2.3