summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-06-26 09:09:50 -0700
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-06-26 09:09:50 -0700
commit13295abfe76083be62044cb1b70a5b012870cc6c (patch)
treefb575151b456dda8dde411efaf3fb1943ed35a06 /indra
parentc52a8783c5c060abe062ed64de32ccab86213d8c (diff)
parent62084955c104923e204a6a214c47786391b1b586 (diff)
Merge
Diffstat (limited to 'indra')
-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);
+ }
}
}