From c85f976ed634c711ced4d834451a4808ea399e41 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Mon, 24 Dec 2012 22:08:44 +0100
Subject: [PATCH] Fix outbox notifications.

---
 .../skins/default/xui/en-us/notifications.xml | 20 +++++++++----------
 .../skins/default/xui/es/notifications.xml    | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index 6f3820cc6..4a4463b65 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -309,9 +309,9 @@ You don't have permission to copy one or more of these items to the Merchant Out
   </notification>
 
   <notification
-   icon="OutboxStatus_Success"
+   icon="alert.tga"
    name="OutboxFolderCreated"
-   type="outbox">
+   type="alert">
     <unique/>
 A new folder has been created for each item you have transferred into the top level of your Merchant Outbox.
 
@@ -322,9 +322,9 @@ A new folder has been created for each item you have transferred into the top le
   </notification>
 
   <notification
-   icon="OutboxStatus_Success"
+   icon="alert.tga"
    name="OutboxImportComplete"
-   type="outbox">
+   type="alert">
 Success
 
 All folders were successfully sent to the Marketplace.
@@ -336,9 +336,9 @@ All folders were successfully sent to the Marketplace.
   </notification>
 
   <notification
-   icon="OutboxStatus_Warning"
+   icon="alert.tga"
    name="OutboxImportHadErrors"
-   type="outbox">
+   type="alert">
 Some folders did not transfer
 
 Errors occurred when some folders were sent to the Marketplace.  Those folders are still in your Merchant Outbox.
@@ -351,9 +351,9 @@ See the [[MARKETPLACE_IMPORTS_URL] error log] for more information.
   </notification>
 
   <notification
-   icon="OutboxStatus_Error"
+   icon="alertmodal.tga"
    name="OutboxImportFailed"
-   type="outbox">
+   type="alertmodal">
 Transfer failed
 
 No folders were sent to the Marketplace because of a system or network error.  Try again later.
@@ -364,9 +364,9 @@ No folders were sent to the Marketplace because of a system or network error.  T
   </notification>
 
   <notification
-   icon="OutboxStatus_Error"
+   icon="alertmodal.tga"
    name="OutboxInitFailed"
-   type="outbox">
+   type="alertmodal">
 Marketplace initialization failed
 
 Initialization with the Marketplace failed because of a system or network error.  Try again later.
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index ef0ae35cb..ead81813c 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -163,14 +163,14 @@ Asegurate que tu conexión a internet funciona correctamente.
 		<usetemplate name="okcancelbuttons" notext="No mover ítem(s)" yestext="Mover ítem(s)"/>
 	</notification>
 	
-	<notification name="OutboxFolderCreated" type="outbox">
+	<notification name="OutboxFolderCreated" type="alert">
 		<unique/>
 			Una nueva carpeta ha sido creada por cada ítem que has transferido en el nivel superior de tu Merchant Outbox.
 	
 		<usetemplate ignoretext="Una nueva carpeta ha sido creada en el Merchant Outbox" name="okignore" yestext="OK"/>
 	</notification>
 	
-	<notification name="OutboxImportComplete" type="outbox">
+	<notification name="OutboxImportComplete" type="alert">
 		Completado
 
 Todas las carpetas ha sido enviadas satisfactoriamente al Marketplace.
@@ -178,7 +178,7 @@ Todas las carpetas ha sido enviadas satisfactoriamente al Marketplace.
 		<usetemplate ignoretext="Todas las carpetas se han enviado al Marketplace" name="okignore" yestext="OK"/>
 	</notification>
 	
-	<notification name="OutboxImportHadErrors" type="outbox">
+	<notification name="OutboxImportHadErrors" type="alert">
 		Algunas carpetas no fueron transferidas
 
 Ha habido errores al enviar algunas carpetas al Markeplace. Estas carpetas aún están en tu Merchant Outbox.
@@ -188,7 +188,7 @@ Mira en el  [log de errores [[MARKETPLACE_IMPORTS_URL]] para mayor información.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	
-	<notification name="OutboxImportFailed" type="outbox">
+	<notification name="OutboxImportFailed" type="alertmodal">
 		La transferencia ha fallado
 
 No se han enviado carpetas al Marketplace debido a un error de sistema o de red. Inténtalo nuevamente más tarde.
@@ -196,7 +196,7 @@ No se han enviado carpetas al Marketplace debido a un error de sistema o de red.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	
-	<notification name="OutboxInitFailed" type="outbox">
+	<notification name="OutboxInitFailed" type="alertmodal">
 		Ha fallado la inicialización del Marketplace
 
 La inicialización con el Marketplace ha fallado debido a un error de sistema o de red. Inténtalo nuevamente más tarde.