From 14ebeffe8776562c0ac9711a44b7ebe3dec49c47 Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Wed, 27 Jun 2012 11:32:54 -0700 Subject: MAINT-1078 Merchant Outbox import failures Add 1s throttle on update checks for importer reviewed with Simon --- indra/newview/llmarketplacefunctions.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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); + } } } -- cgit v1.2.3 From a49a47def661873100e3d7290fe74c25fb5de472 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 29 Jun 2012 16:24:04 -0400 Subject: tag merge of DRTVWR-174 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0bca1f09ab..db8806f0b7 100644 --- a/.hgtags +++ b/.hgtags @@ -330,3 +330,4 @@ af5f3e43e6e4424b1da19d9e16f6b853a7b822ed DRTVWR-169 09ef7fd1b0781f33b8a3a9af6236b7bcb4831910 DRTVWR-170 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 DRTVWR-158 +cbea6356ce9cb0c313b6777f10c5c14783264fcc DRTVWR-174 -- cgit v1.2.3