diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-11 11:26:56 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-11 11:26:56 -0800 |
| commit | 0a1cb4f03ee1aeb0cfc9d9bdb837043d0f46f292 (patch) | |
| tree | ae93a6f045393d7a9d41856bfc31d6280001547f /indra/newview/skins/default | |
| parent | 00b767e5a91d9e3379119c867164f9be40f888cc (diff) | |
EXP-1791 FIX -- Handle case where initialization with SLM fails in the Merchant Outbox floater in the viewer
* Updated marketplace import to properly handle failed cases of authentications
and invalid cookies. The import will reset to an uninitialized state and then
trigger and initialization followed immediately by an import when appropriate.
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 2269703cb6..61346bf3d6 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -230,8 +230,9 @@ All folders were successfully sent to the Marketplace. type="outbox"> Some folders did not transfer -Errors occurred when some folders were sent to the Marketplace. Those folders are still in your Merchant Outbox. See the error log for more information. +Errors occurred when some folders were sent to the Marketplace. Those folders are still in your Merchant Outbox. +See the error log for more information. <usetemplate name="okbutton" yestext="OK"/> @@ -245,8 +246,6 @@ Transfer failed No folders were sent to the Marketplace because of a system or network error. Try again later. -Error [ERROR_CODE] - <usetemplate name="okbutton" yestext="OK"/> @@ -260,8 +259,6 @@ Marketplace initialization failed Initialization with the Marketplace failed because of a system or network error. Try again later. -Error [ERROR_CODE] - <usetemplate name="okbutton" yestext="OK"/> |