diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-11-27 12:20:06 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-11-27 12:20:06 -0800 |
| commit | 1897e6ce87d260364d2aad1b1f3fa67e5f2e0d04 (patch) | |
| tree | b155e61a030b07a5a59e218d456a22cbbce8b879 /indra | |
| parent | 66dff9d93bca7c6bdc18d57bb16a40c9753f6711 (diff) | |
ACME-1221 : Do not clear merchant import cookie on 404, happens to newly minted merchants
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llmarketplacefunctions.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index f01a3de16c..05c9d76810 100755 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -192,9 +192,11 @@ namespace LLMarketplaceImport llinfos << " SLM GET timer: " << slmGetTimer.getElapsedTimeF32() << llendl; } - // MAINT-2452 : Do not clear the cookie on IMPORT_DONE_WITH_ERRORS + // MAINT-2452 : Do not clear the cookie on IMPORT_DONE_WITH_ERRORS : Happens when trying to import objects with wrong permissions + // ACME-1221 : Do not clear the cookie on IMPORT_NOT_FOUND : Happens for newly created Merchant accounts that are initally empty if ((status >= MarketplaceErrorCodes::IMPORT_BAD_REQUEST) && - (status != MarketplaceErrorCodes::IMPORT_DONE_WITH_ERRORS)) + (status != MarketplaceErrorCodes::IMPORT_DONE_WITH_ERRORS) && + (status != MarketplaceErrorCodes::IMPORT_NOT_FOUND)) { if (gSavedSettings.getBOOL("InventoryOutboxLogging")) { @@ -202,9 +204,9 @@ namespace LLMarketplaceImport } sMarketplaceCookie.clear(); } - else if (gSavedSettings.getBOOL("InventoryOutboxLogging") && (status == MarketplaceErrorCodes::IMPORT_DONE_WITH_ERRORS)) + else if (gSavedSettings.getBOOL("InventoryOutboxLogging") && (status >= MarketplaceErrorCodes::IMPORT_BAD_REQUEST)) { - llinfos << " SLM GET : Got IMPORT_DONE_WITH_ERRORS, marketplace cookie not cleared." << llendl; + llinfos << " SLM GET : Got error status = " << status << ", but marketplace cookie not cleared." << llendl; } sImportInProgress = (status == MarketplaceErrorCodes::IMPORT_PROCESSING); |