Merge remote-tracking branch 'mccabe/1.4-fbeta-export_texture_sl' into next

1 files changed, 18 insertions, 4 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index cb8171d..4474dad 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7301,14 +7301,28 @@ Shadows cannot be enabled due to your graphics settings being set too low. Make
 </notification>
 
 <notification
- icon="notifytip.tga"
- name="NoTextureExportSL"
- type="notifytip">
-Note: To comply with the Second Life Terms of Service, Imprudence did not download any texture files for the exported object(s).
+ icon="alert.tga"
+ name="ExportFailed"
+ type="alert">
+Bad permissions for the exported object. Export aborted.
 </notification>
 
 <notification
  icon="alert.tga"
+ name="ExportPartial"
+ type="alert">
+Object exported. Some textures could not be saved due to: [REASON]
+</notification>
+
+<notification
+ icon="notifytip.tga"
+ name="ExportSuccessful"
+ type="notifytip">
+Export successful.
+</notification>  
+  
+<notification
+ icon="alert.tga"
  name="Help_CmdLine"
  type="alert">
 Various options for command line features.