diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-31 22:04:27 -0800 | 
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-31 22:04:27 -0800 | 
| commit | bb841e7d21a4baf25e5dd240bc4776c853710ac9 (patch) | |
| tree | cff83f87cea1b5fdc41f9422a46288e831406bfb | |
| parent | 677f65b3a2f863895250f1c25f91c79e43810caf (diff) | |
MAINT-2301 : Fixed : Ignoring 499 timeout errors on POST (safe).
| -rw-r--r-- | indra/newview/llmarketplacefunctions.cpp | 10 | 
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index 79d663ead8..2eeaebf823 100644 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -138,6 +138,16 @@ namespace LLMarketplaceImport  				llinfos << " SLM POST timer: " << slmPostTimer.getElapsedTimeF32() << llendl;  			} +			// MAINT-2301 : we determined we can safely ignore that error in that context +			if (status == MarketplaceErrorCodes::IMPORT_JOB_TIMEOUT) +			{ +				if (gSavedSettings.getBOOL("InventoryOutboxLogging")) +				{ +					llinfos << " SLM POST : Ignoring time out status and treating it as success" << llendl; +				} +				status = MarketplaceErrorCodes::IMPORT_DONE; +			} +			  			if (status >= MarketplaceErrorCodes::IMPORT_BAD_REQUEST)  			{  				if (gSavedSettings.getBOOL("InventoryOutboxLogging"))  | 
