diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-02 12:38:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-02 12:38:07 -0400 |
| commit | ed5b46c9b0f71b458f8dd58a9c76ae51f974726b (patch) | |
| tree | e48c8a1dbe48157798d0625c6d54606b25ebc208 /indra/newview/llmarketplacefunctions.cpp | |
| parent | 9b1208e4958859e2328ce60acc4d8efaa5dbeed2 (diff) | |
| parent | 077e851bdd8e46fa9d5a43712dacdf5945a979f7 (diff) | |
merge back changes from 3.3.4-beta2
Diffstat (limited to 'indra/newview/llmarketplacefunctions.cpp')
| -rw-r--r-- | indra/newview/llmarketplacefunctions.cpp | 8 |
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); + } } } |