From 570d02dc7e41c3e08477e7f759d632db78690eb4 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Tue, 29 Nov 2011 16:57:37 -0800 Subject: Initial merchant outbox button --- indra/newview/skins/default/xui/en/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index befcc5dd87..105c6095e6 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3675,6 +3675,7 @@ Try enclosing path to the editor with double quotes. Marketplace Mini-map Move + Merchant outbox People Picks Places @@ -3700,6 +3701,7 @@ Try enclosing path to the editor with double quotes. Go shopping Show nearby people Moving your avatar + Transfer items to your marketplace for sale Friends, groups, and nearby people Places to show as favorites in your profile Places you've saved -- cgit v1.2.3 From e826cbd90750fd38565e4e44390948f36254cf1f Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 12 Dec 2011 15:02:52 -0800 Subject: EXP-1682 FIX EXP-1683 FIX EXP-1705 FIX EXP-1707 FIX * Outbox folder count now uses inventory API directly rather than inventory folder view for folder count and item status * Asynchronous fetches are triggered for the outbox content when the window is opened and when it receives focus * Marketplace URL's for empty and non-merchant outbox view have been updated * "Copy to Merchant Outbox" and "Delete" context menu items should be fully functional now with item counts, etc. --- indra/newview/skins/default/xui/en/strings.xml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index b8d5f93320..7dd965de84 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2029,18 +2029,28 @@ Returns a string with the requested data about the region Drag a landmark here to add it to your favorites. You do not have a copy of this texture in your inventory When you purchase or otherwise receive an item, it will appear here so you can drag it to a folder in your inventory, or delete it if you do not wish to keep it. - http://marketplace.[DOMAIN_NAME] - http://marketplace.[DOMAIN_NAME]/create_store - http://marketplace.[DOMAIN_NAME]/learn_more + https://marketplace.[MARKETPLACE_DOMAIN_NAME] + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/create_store + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/[AGENT_ID]/store/dashboard + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more Your Merchant Outbox is not properly configured Merchant Outbox configuration error Please contact Customer Service to correct the problem. - Anyone can sell items on the Marketplace + Anyone can sell items on the Marketplace. Become a merchant! - [[MARKETPLACE_URL] The Second Life Marketplace] offers more than one million virtual products for sale, all of them created by Residents. You, too, can sell items you create, as well as some of the items you have purchased. It’s easy and setup is free. [[LEARN_MORE_URL] Learn more] or [[CREATE_STORE_URL] create a store] on the Marketplace to get started. - A new way to send items to the Marketplace + + The Second Life Marketplace offers more than one million virtual products for sale, all of them created by Residents like you. You too can create items and sell them on the Marketplace. Creating a store is easy and free of charge. + + [[MARKETPLACE_URL] Visit the Marketplace] + [[MARKETPLACE_LEARN_MORE_URL] Learn more about creating a store] + + Your outbox is empty. Drag and drop items here to prepare them for sale on the Marketplace - Drag items or folders that you wish to sell into this area. A copy of the item will appear, leaving your inventory unchanged, unless you have dragged a no-copy item. When you are ready to send the items to the Marketplace, click the Upload button. Once your items have been moved to your Marketplace Inventory, they will disappear from this folder. + + Drag folders to this area. When you are ready to send them to the Marketplace for sale, click the "Send to Marketplace" button below. + + [[MARKETPLACE_DASHBOARD_URL] Go to your Merchant Dashboard] + No errors Error: Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge). -- cgit v1.2.3 From d3f06b296203c08c900c4e569ce5df0ac2f27715 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 12 Dec 2011 17:04:58 -0800 Subject: Fixed marketplace URL trailing '/' and updated to latest window shade code from viewer-experience --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 7dd965de84..3c7465cd7c 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2029,7 +2029,7 @@ Returns a string with the requested data about the region Drag a landmark here to add it to your favorites. You do not have a copy of this texture in your inventory When you purchase or otherwise receive an item, it will appear here so you can drag it to a folder in your inventory, or delete it if you do not wish to keep it. - https://marketplace.[MARKETPLACE_DOMAIN_NAME] + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ https://marketplace.[MARKETPLACE_DOMAIN_NAME]/create_store https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/[AGENT_ID]/store/dashboard https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more -- cgit v1.2.3 From 181eaa8196d19d5d0c1db17fe27bd2bdee11525b Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 12 Dec 2011 17:22:47 -0800 Subject: EXP-1648 FIX * Merchant outbox no longer crashes for non-merchants. * Folder count is hidden for non-merchants. * Drag and drop to merchant outbox floater is disabled for non-merchants. --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 3c7465cd7c..d8da56d338 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2042,6 +2042,7 @@ Returns a string with the requested data about the region The Second Life Marketplace offers more than one million virtual products for sale, all of them created by Residents like you. You too can create items and sell them on the Marketplace. Creating a store is easy and free of charge. [[MARKETPLACE_URL] Visit the Marketplace] + [[MARKETPLACE_LEARN_MORE_URL] Learn more about creating a store] Your outbox is empty. -- cgit v1.2.3 From 90e6336b27ae962052a68ec17205e7b1f87bdb4e Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Thu, 15 Dec 2011 09:51:26 -0800 Subject: EXP-1725 FIX -- Carriage return or tab characters shown in Outbox text on Windows * Removed tabs from outbox strings. --- indra/newview/skins/default/xui/en/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index d8da56d338..b83571a106 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2039,18 +2039,18 @@ Returns a string with the requested data about the region Anyone can sell items on the Marketplace. Become a merchant! - The Second Life Marketplace offers more than one million virtual products for sale, all of them created by Residents like you. You too can create items and sell them on the Marketplace. Creating a store is easy and free of charge. - - [[MARKETPLACE_URL] Visit the Marketplace] +The Second Life Marketplace offers more than one million virtual products for sale, all of them created by Residents like you. You too can create items and sell them on the Marketplace. Creating a store is easy and free of charge. + +[[MARKETPLACE_URL] Visit the Marketplace] - [[MARKETPLACE_LEARN_MORE_URL] Learn more about creating a store] +[[MARKETPLACE_LEARN_MORE_URL] Learn more about creating a store] Your outbox is empty. Drag and drop items here to prepare them for sale on the Marketplace - Drag folders to this area. When you are ready to send them to the Marketplace for sale, click the "Send to Marketplace" button below. - - [[MARKETPLACE_DASHBOARD_URL] Go to your Merchant Dashboard] +Drag folders to this area. When you are ready to send them to the Marketplace for sale, click the "Send to Marketplace" button below. + +[[MARKETPLACE_DASHBOARD_URL] Go to your Merchant Dashboard] No errors -- cgit v1.2.3 From 2e564abcd682c348de3a2d3a50ef58df545c143b Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Thu, 15 Dec 2011 14:26:42 -0800 Subject: EXP-1730 FIX EXP-1731 FIX EXP-1735 FIX EXP-1736 FIX EXP-1737 FIX EXP-1738 FIX EXP-1739 FIX * Users can no longer drag and drop items to the outbox from in world, notecards or the library. * Drag and drop now blocks the creation of hierarchies that are too deep, too many folders or contain too many items. * Settings now exist to specify drag and drop limitations to the outbox, named: InventoryOutboxMaxFolderDepth (4) InventoryOutboxMaxFolderCount (20) InventoryOutboxMaxItemCount (200) --- indra/newview/skins/default/xui/en/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index b83571a106..0d9a7e5c41 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -165,8 +165,10 @@ Please try logging in again in a minute. Only a single item can be dragged here One or more of these objects cannot be sold or transferred to another user. + You can only transfer objects in your inventory to your merchant outbox. You are wearing one or more of these objects. Remove them from your avatar and try moving them again. This folder has too many levels of subfolders. Rearrange the interior folders to a maximum of 4 levels deep (Root Folder contains A contains B contains C). + This folder has too many subfolders. Reorganize the interior to a maximum of 20 folders. This folder contains more than 200 objects. Box some of the items to reduce the object count. -- cgit v1.2.3 From 6c26fdea4d62f723c3bdbec9ded032e6d77301b8 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 19 Dec 2011 16:46:26 -0800 Subject: EXP-1741 FIX -- Learn more link goes to page not found from Outbox for user that is not a merchant an Agni EXP-1746 FIX -- Update Outbox messaging EXP-1748 FIX -- Close down on messaging with Spinner MKT-3403 support -- viewer tooltips updated to match errors in marketplace * Copy has been updated to match the design per Leo and Brooke * Marketplace URL's have also been updated * The outbox floater now reports a status string in the existing folder count control --- indra/newview/skins/default/xui/en/strings.xml | 37 +++++++++++--------------- 1 file changed, 15 insertions(+), 22 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 0d9a7e5c41..18ca3033e9 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -164,12 +164,13 @@ Please try logging in again in a minute. Land: Only a single item can be dragged here - One or more of these objects cannot be sold or transferred to another user. - You can only transfer objects in your inventory to your merchant outbox. - You are wearing one or more of these objects. Remove them from your avatar and try moving them again. - This folder has too many levels of subfolders. Rearrange the interior folders to a maximum of 4 levels deep (Root Folder contains A contains B contains C). - This folder has too many subfolders. Reorganize the interior to a maximum of 20 folders. - This folder contains more than 200 objects. Box some of the items to reduce the object count. + + One or more of these objects cannot be sold or transferred. + Your merchant outbox can only accept items directly from your inventory + You can not put items you are wearing into your merchant outbox + Depth of nested folders exceeds 3 + Subfolder count in top-level folder exceeds 20 + Item count in top-level folder exceeds 200 Click to view this web page @@ -2032,33 +2033,25 @@ Returns a string with the requested data about the region You do not have a copy of this texture in your inventory When you purchase or otherwise receive an item, it will appear here so you can drag it to a folder in your inventory, or delete it if you do not wish to keep it. https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ - https://marketplace.[MARKETPLACE_DOMAIN_NAME]/create_store - https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/[AGENT_ID]/store/dashboard + http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4 + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more - Your Merchant Outbox is not properly configured - Merchant Outbox configuration error - Please contact Customer Service to correct the problem. Anyone can sell items on the Marketplace. - Become a merchant! + -The Second Life Marketplace offers more than one million virtual products for sale, all of them created by Residents like you. You too can create items and sell them on the Marketplace. Creating a store is easy and free of charge. - -[[MARKETPLACE_URL] Visit the Marketplace] - -[[MARKETPLACE_LEARN_MORE_URL] Learn more about creating a store] +If you'd like to become a merchant, you'll need to [[MARKETPLACE_CREATE_STORE_URL] create a Marketplace store]. Your outbox is empty. - Drag and drop items here to prepare them for sale on the Marketplace + -Drag folders to this area. When you are ready to send them to the Marketplace for sale, click the "Send to Marketplace" button below. - -[[MARKETPLACE_DASHBOARD_URL] Go to your Merchant Dashboard] +Drag folders to this area and click "Send to Marketplace" to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace]. No errors Error: Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge). Error: This folder has no contents. - Error: This item failed to upload because your merchant account has too many items unassociated with products. To fix this error, login to the marketplace website and reduce your unassociated item count. + 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. + 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. Error: This item contains too many levels of nested folders. Reorganize it to a maximum of 3 levels of nested folders. Error: This item can not be sold on the marketplace. -- cgit v1.2.3 From 912833bafa9a59734432787158e36b66ee9586aa Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 4 Jan 2012 14:04:32 -0800 Subject: EXP-1738 FIX -- Disable drag and drop to folders in the outbox that would create a hierarchy that contains too many folders * Updated drag and drop to correctly handle moving to and from outbox as opposed to within the outbox when dealing with folder and item count limitations related to depth and total folder count. --- indra/newview/skins/default/xui/en/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 18ca3033e9..6672d479a2 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -172,6 +172,9 @@ Please try logging in again in a minute. Subfolder count in top-level folder exceeds 20 Item count in top-level folder exceeds 200 + You can't move a folder into its child + You can't move a folder into itself + Click to view this web page Click to view this location's information -- cgit v1.2.3 From 98a85b1bf2d7decf477d3d1076859fdeec6f1b46 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 9 Jan 2012 13:39:58 -0800 Subject: EXP-1159 FIX -- User can get No transfer items into Merchant Outbox by rezzing object from Outbox, including No Transfer item in contents, and then taking back into Inventory * Drag and drop to the 3D world is now disabled from the outbox --- indra/newview/skins/default/xui/en/strings.xml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 20d9463186..a78f3df5b6 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -18,7 +18,7 @@ Clearing cache... Initializing texture cache... Initializing VFS... - Graphics initialization failed. Please update your graphics driver! + Graphics initialization failed. Please update your graphics driver! Restoring... @@ -35,9 +35,9 @@ Previous login attempt failed. Logging in, attempt [NUMBER] Loading world... Initializing embedded web browser... - Initializing multimedia... - Loading fonts... - Verifying cache files (can take 60-90 seconds)... + Initializing multimedia... + Loading fonts... + Verifying cache files (can take 60-90 seconds)... Processing response... Initializing world... Decoding images... @@ -49,12 +49,12 @@ Waiting for region handshake... Connecting to region... Downloading clothing... - The server returned an invalid or corrupt certificate. Please contact the Grid administrator. - An invalid hostname was used to access the server, please check your SLURL or Grid hostname. - The certificate returned by the Grid appears to be expired. Please check your system clock, or contact your Grid administrator. - The certificate returned by the server could not be used for SSL. Please contact your Grid administrator. - Too many certificates were in the servers Certificate chain. Please contact your Grid administrator. - The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator. + The server returned an invalid or corrupt certificate. Please contact the Grid administrator. + An invalid hostname was used to access the server, please check your SLURL or Grid hostname. + The certificate returned by the Grid appears to be expired. Please check your system clock, or contact your Grid administrator. + The certificate returned by the server could not be used for SSL. Please contact your Grid administrator. + Too many certificates were in the servers Certificate chain. Please contact your Grid administrator. + The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator. Network error: Could not establish connection, please check your network connection. Login failed. @@ -165,6 +165,7 @@ Please try logging in again in a minute. Only a single item can be dragged here + You can not rez items in your merchant outbox One or more of these objects cannot be sold or transferred. Your merchant outbox can only accept items directly from your inventory You can not put items you are wearing into your merchant outbox -- cgit v1.2.3 From 59950f6178699b96e86bfd2c0bc701271b3f1a6b Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 11 Jan 2012 16:49:32 -0800 Subject: EXP-1778 FIX -- Link to Marketplace Error log in transfer failed viewer notification * Added a link to the "imports" log from the "done with errors" notification when sending folders to the marketplace. --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a78f3df5b6..84fce6630b 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2040,6 +2040,7 @@ Returns a string with the requested data about the region https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4 https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more Anyone can sell items on the Marketplace. -- cgit v1.2.3