From c8e76908d71a67355beecf22c4daa8d0a50ef08e Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 28 Jan 2013 18:32:47 -0800 Subject: MAINT-2287 : Fixed : Test the merchant/no merchant status without relying on outbox, Recreate missing outbox for a merchant, UI clean up on init. --- indra/newview/skins/default/xui/en/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2157a05bbf..c375e4906c 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2190,6 +2190,11 @@ If you'd like to become a merchant, you'll need to [[MARKETPLACE_CREATE_STORE_UR Drag folders to this area and click "Send to Marketplace" to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace]. + Initializing Marketplace. + + +We are accessing your account on the [[MARKETPLACE_CREATE_STORE_URL] Marketplace store]. + 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 677f65b3a2f863895250f1c25f91c79e43810caf Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 31 Jan 2013 20:26:59 -0800 Subject: MAINT-2301 : WIP : Catch a bit more 4xx and 5xx error codes, display the error code in the alert. --- indra/newview/skins/default/xui/en/notifications.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 9dae77a304..cb6372f782 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -271,7 +271,7 @@ See the [[MARKETPLACE_IMPORTS_URL] error log] for more information. icon="OutboxStatus_Error" name="OutboxImportFailed" type="outbox"> -Transfer failed +Transfer failed with error '[ERROR_CODE]' No folders were sent to the Marketplace because of a system or network error. Try again later. @@ -284,7 +284,7 @@ No folders were sent to the Marketplace because of a system or network error. T icon="OutboxStatus_Error" name="OutboxInitFailed" type="outbox"> -Marketplace initialization failed +Marketplace initialization failed with error '[ERROR_CODE]' Initialization with the Marketplace failed because of a system or network error. Try again later. -- cgit v1.2.3 From 6a8e22cf022bfc44335d6d8e6f83315d84b24c8c Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 15 Feb 2013 14:02:33 -0800 Subject: MAINT-2301 : Change messaging in the Merchant Outbox panel when an error happened, so not to be confused with the not-a-merchant case. --- indra/newview/skins/default/xui/en/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index c375e4906c..5be1285242 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2195,6 +2195,11 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale We are accessing your account on the [[MARKETPLACE_CREATE_STORE_URL] Marketplace store]. + Marketplace Errors. + + +The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. + 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