From 2a6ce118882b7ac4ce533dcd3c74f582e01bdb29 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 21 May 2014 16:40:23 -0700
Subject: DD-91, DD-84 : WIP : Verify restrictions when moving things to
 marketplace, provide clear alert for errors, parametrize alerts and tooltips
 correctly

---
 indra/newview/skins/default/xui/en/menu_inventory.xml |  8 --------
 indra/newview/skins/default/xui/en/notifications.xml  | 13 +++++++++++++
 indra/newview/skins/default/xui/en/strings.xml        |  7 ++++---
 3 files changed, 17 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 231e03b1bb..5e67cdf501 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -793,14 +793,6 @@
 		 parameter="copy_to_outbox" />
 	</menu_item_call>
 	<menu_item_call
-	 label="Send to Marketplace"
-	 layout="topleft"
-	 name="Marketplace Send">
-		<menu_item_call.on_click
-		 function="Inventory.DoToSelected"
-		 parameter="send_to_marketplace" />
-	</menu_item_call>
-	<menu_item_call
      label="--no options--"
      layout="topleft"
      name="--no options--" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 370a2af5e0..dcf53c8804 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -292,6 +292,19 @@ Initialization with the Marketplace failed because of a system or network error.
          name="okbutton"
          yestext="OK"/>
   </notification>
+
+    <notification
+        icon="OutboxStatus_Error"
+        name="MerchantPasteFailed"
+        type="outbox">
+        Copy or move to Marketplace Listings failed with error :
+        
+        &apos;[ERROR_CODE]&apos;
+        
+        <usetemplate
+        name="okbutton"
+        yestext="OK"/>
+    </notification>
     
 
     <notification
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 18552c3153..aed628d4f7 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -215,9 +215,9 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipOutboxNotInInventory">You can only put items from your inventory on the marketplace</string>
 	<string name="TooltipOutboxWorn">You can not put items you are wearing on the marketplace</string>
 	<string name="TooltipOutboxCallingCard">You can not put calling cards on the marketplace</string>
-	<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds 3</string>
-	<string name="TooltipOutboxTooManyFolders">Subfolder count in top-level folder exceeds 20</string>
-	<string name="TooltipOutboxTooManyObjects">Item count in top-level folder exceeds 200</string>
+	<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]</string>
+	<string name="TooltipOutboxTooManyFolders">Subfolder count in top-level folder exceeds [AMOUNT]</string>
+	<string name="TooltipOutboxTooManyObjects">Item count in top-level folder exceeds [AMOUNT]</string>
 	
 	<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
 	<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>
@@ -2264,6 +2264,7 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	<string name="Marketplace Error None">No errors</string>
 	<string name="Marketplace Error Not Merchant">Error: Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
 	<string name="Marketplace Error Empty Folder">Error: This folder has no contents.</string>
+	<string name="Marketplace Error Not Accepted">Error: Cannot move item in that folder.</string>
 	<string name="Marketplace Error Unassociated Products">Error: This item failed to upload because your merchant account has too many items unassociated with products.  To fix this error, log in to the marketplace website and reduce your unassociated item count.</string>
 
 	<string name="Marketplace Error Object Limit">Error: This item contains too many objects.  Fix this error by placing objects together in boxes to reduce the total count to less than 200.</string>
-- 
cgit v1.2.3