From c7e02b0835cbb50777c677f618c4a957e69fabee Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 30 Jan 2019 14:36:46 -0800
Subject: SL-9925: Viewer now shows an error message if import from legacy
 windlight fails.

---
 indra/newview/skins/default/xui/en/notifications.xml | 7 +++++--
 indra/newview/skins/default/xui/en/strings.xml       | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9ca9d4cd51..5ea5023c94 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11267,7 +11267,10 @@ This Region does not support environmental settings.
    name="WLImportFail"
    persist="true"
    type="alertmodal">
-Unable to import legacy Windlight settings from [FILE].
+Unable to import legacy Windlight settings [NAME] from 
+[FILE].
+
+[REASONS]
   <tag>fail</tag>
   </notification>
 
@@ -11331,5 +11334,5 @@ You may not edit settings directly from the libary.
 Please copy to your own inventory and try again.
   <tag>fail</tag>
   </notification>
-
+  
 </notifications>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1879ce6f32..71133f582f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -378,6 +378,11 @@ Error in upload request.  Please visit
 http://secondlife.com/support for help fixing this problem.
 </string>
 
+    <!-- Settings errors -->
+    <string name="SettingValidationError">Validation failed for importing settings [NAME]</string>
+    <string name="SettingImportFileError">Could not open file [FILE]</string>
+    <string name="SettingParseFileError">Could not open file [FILE]</string>
+    <string name="SettingTranslateError">Could not translate legacy windlight [NAME]</string>
 	<!-- Asset Type human readable names:  these will replace variable [TYPE] in notification FailedToFindWearable* -->
 	<!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem -->
 	<string name="texture">texture</string>
-- 
cgit v1.2.3