diff options
| author | Richard Linden <none@none> | 2012-01-18 13:36:16 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-18 13:36:16 -0800 |
| commit | a1b200878fdc517252506a19f71432ab956086c2 (patch) | |
| tree | 627d180f48cc8dca01f9144da39b2fa6fbd84979 /indra/newview/llmarketplacefunctions.cpp | |
| parent | 41a43a4125a69835e6a76f5792a267ba0797f41a (diff) | |
| parent | b1d28300fbd37edfb4093b13ea0d243e45d6952b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llmarketplacefunctions.cpp')
| -rw-r--r-- | 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 ee7505c4f4..a3f0a6062c 100644 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -132,11 +132,12 @@ namespace LLMarketplaceImport } if ((status == MarketplaceErrorCodes::IMPORT_REDIRECT) || - (status == MarketplaceErrorCodes::IMPORT_AUTHENTICATION_ERROR)) + (status == MarketplaceErrorCodes::IMPORT_AUTHENTICATION_ERROR) || + (status == MarketplaceErrorCodes::IMPORT_JOB_TIMEOUT)) { if (gSavedSettings.getBOOL("InventoryOutboxLogging")) { - llinfos << " SLM POST clearing marketplace cookie due to authentication failure" << llendl; + llinfos << " SLM POST clearing marketplace cookie due to authentication failure or timeout" << llendl; } sMarketplaceCookie.clear(); @@ -173,11 +174,12 @@ namespace LLMarketplaceImport llinfos << " SLM GET content: " << content.asString() << llendl; } - if (status == MarketplaceErrorCodes::IMPORT_AUTHENTICATION_ERROR) + if ((status == MarketplaceErrorCodes::IMPORT_AUTHENTICATION_ERROR) || + (status == MarketplaceErrorCodes::IMPORT_JOB_TIMEOUT)) { if (gSavedSettings.getBOOL("InventoryOutboxLogging")) { - llinfos << " SLM GET clearing marketplace cookie due to authentication failure" << llendl; + llinfos << " SLM GET clearing marketplace cookie due to authentication failure or timeout" << llendl; } sMarketplaceCookie.clear(); |