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/llfloateroutbox.cpp | |
| 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/llfloateroutbox.cpp')
| -rw-r--r-- | indra/newview/llfloateroutbox.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp index 28589f5e9a..130c26acdc 100644 --- a/indra/newview/llfloateroutbox.cpp +++ b/indra/newview/llfloateroutbox.cpp @@ -438,7 +438,6 @@ void LLFloaterOutbox::importReportResults(U32 status, const LLSD& content) LLSD subs; subs["[ERROR_CODE]"] = status_string; - //llassert(status == MarketplaceErrorCodes::IMPORT_JOB_FAILED); LLNotificationsUtil::add("OutboxImportFailed", subs); } |