summaryrefslogtreecommitdiff
path: root/indra/newview/llmarketplacefunctions.cpp
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-07-13 11:10:40 -0700
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-07-13 11:10:40 -0700
commit7cd5f7d479b889c3dcdb4bcd0ee6b65b5b5a025f (patch)
treef0ec4e77540edd8680f41ae1719e9b66f279fd60 /indra/newview/llmarketplacefunctions.cpp
parente86b1c18db0629d64f8bf26fcf69e64072d084e6 (diff)
parent3a56fbf867194ec8fbc7d8237f9781ac9d72c8a4 (diff)
Merge from lindenlab/viewmaster so we can get rid of it
Diffstat (limited to 'indra/newview/llmarketplacefunctions.cpp')
-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);
+ }
}
}