From 05f4e8a10517b3b341359a210aeb0af06c44d43a Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 22 Feb 2013 18:53:40 -0800
Subject: CHUI-778 (Saving preferences updates text in all open message panels
 in conversation floater to show as old messages) Now changing the
 log/transcripts file location actually moves the files to the new location.
 Prior behavior just started a new history at that location. Also a fix was
 made so that if the user changed the log/transcripts path then after pressing
 the Preferences 'OK' button the new location will be saved to the
 corresponding .xml file.

---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++
 1 file changed, 11 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 3ae9b206a4..234c6d7c0f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10028,4 +10028,15 @@ Cannot create large prims that intersect other players.  Please re-try when othe
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alert.tga"
+   name="PreferenceChatPathChanged"
+   type="alert">
+   Unable to move files. Restored previous path.
+    <usetemplate
+     ignoretext="Unable to move files. Restored previous path."
+     name="okignore"
+     yestext="OK"/>
+  </notification>
+  
 </notifications>
-- 
cgit v1.2.3


From a26c1672235578f3a4e21be370b11522207e2c57 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Mon, 4 Mar 2013 20:05:35 +0200
Subject: CHUI-757 FIXED CHUI viewer shows Autopilot cancelled notification
 toast when interrupting click to walk:  - The AutopilotCanceled notification
 was disabled for this viewer;

---
 indra/newview/skins/default/xui/en/notifications.xml | 8 --------
 1 file changed, 8 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 3ae9b206a4..9c81c877b5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9706,14 +9706,6 @@ There is no suitable surface to sit on, try another spot.
 No room to sit here, try another spot.
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="AutopilotCanceled"
-   type="notify">
-   <tag>fail</tag>
-Autopilot canceled
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="ClaimObjectFailedNoPermission"
-- 
cgit v1.2.3