From 591891306366e683416b187207fa2b94bdc263a8 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 5 Dec 2011 13:37:37 -0800
Subject: First pass at connecting to the new marketplace API

---
 indra/newview/skins/default/xui/en/notifications.xml   | 18 ++++++++++++++----
 .../skins/default/xui/en/sidepanel_inventory.xml       |  4 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d925bf8f96..46a6da2450 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -213,9 +213,9 @@ Save changes to current clothing/body part?
 
   <notification
    icon="alertmodal.tga"
-   name="OutboxUploadComplete"
+   name="OutboxImportComplete"
    type="alertmodal">
-Marketplace upload complete.
+Marketplace import complete.
         <usetemplate
          name="okbutton"
          yestext="Hooray!"/>
@@ -223,14 +223,24 @@ Marketplace upload complete.
 
   <notification
    icon="alertmodal.tga"
-   name="OutboxUploadHadErrors"
+   name="OutboxImportHadErrors"
    type="alertmodal">
-Marketplace upload completed with errors!  Please correct the problems in your outbox and retry.  Thanks.
+Marketplace import completed with errors!  Please correct the problems in your outbox and retry.  Thanks.
         <usetemplate
          name="okbutton"
          yestext="Boo!"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="OutboxImportFailed"
+   type="alertmodal">
+Marketplace import failed!  Please try again later.  Thanks.
+        <usetemplate
+         name="okbutton"
+         yestext="Rats!"/>
+  </notification>
+
     
 
     <notification
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index b52784d6bc..9f3c57fa0f 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -205,7 +205,7 @@
                          label=""
                          tool_tip="Push to my Marketplace Storefront"
                          is_toggle="false"
-                         name="outbox_sync_btn"
+                         name="outbox_import_btn"
                          follows="top|right"
                          tab_stop="false"
                          halign="center"
@@ -216,7 +216,7 @@
                          enabled="false" />
                      <loading_indicator
                         follows="top|right"
-                        name="outbox_sync_indicator"
+                        name="outbox_import_indicator"
                         top="6"
                         left="-50"
                         height="23"
-- 
cgit v1.2.3