summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorKelly Washington <kelly@lindenlab.com>2012-06-25 15:11:20 -0700
committerKelly Washington <kelly@lindenlab.com>2012-06-25 15:11:20 -0700
commit62084955c104923e204a6a214c47786391b1b586 (patch)
tree109cbc0cdae31acdabdddc72ae99699a177424ad /indra/newview
parent3ca7e94dbe735318929203b1d5c781f7a04acf0a (diff)
MAINT-1078 Merchant Outbox import failures
Add 1s throttle on update checks for importer reviewed with Simon
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llmarketplacefunctions.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 93dd82957f..51df868faa 100644
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -336,13 +336,19 @@ namespace LLMarketplaceImport
// Interface class
//
+static const F32 MARKET_IMPORTER_UPDATE_FREQUENCY = 1.0f;
//static
void LLMarketplaceInventoryImporter::update()
{
if (instanceExists())
{
- LLMarketplaceInventoryImporter::instance().updateImport();
+ static LLTimer update_timer;
+ if (update_timer.hasExpired())
+ {
+ LLMarketplaceInventoryImporter::instance().updateImport();
+ update_timer.setTimerExpirySec(MARKET_IMPORTER_UPDATE_FREQUENCY);
+ }
}
}