diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-11 10:05:15 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-11 10:05:15 -0800 |
| commit | 00b767e5a91d9e3379119c867164f9be40f888cc (patch) | |
| tree | 4ed0a7980bfa2cb6ae4755e858b4894b34dc47b5 /indra/newview/skins/default/xui | |
| parent | b2b421acb6ddea83c9cc25c3593c534f7ff22e57 (diff) | |
EXP-1791 - Handle case where initialization with SLM fails in the Merchant Outbox floater in the viewer
* Added code to clear and re-initialize the SLM cookie when authentication errors are encountered.
* Re-organized logic for outbox import a bit to hopefully be more robust when errors are encountered.
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index bcb3a105ea..2269703cb6 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -252,6 +252,20 @@ Error [ERROR_CODE] yestext="OK"/> </notification> + <notification + icon="OutboxStatus_Error" + name="OutboxInitFailed" + type="outbox"> +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"/> + </notification> <notification |