diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-29 16:24:16 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-29 16:24:16 -0400 |
| commit | 0fff60b3c91ffb443fc633422d5a3c362c0ed4bb (patch) | |
| tree | 5991b273b87c1ea95ca1da265acbc82757b446c9 /indra | |
| parent | 595b49b938b07c349b7c3a74ad70697cd423e2b3 (diff) | |
| parent | a49a47def661873100e3d7290fe74c25fb5de472 (diff) | |
merge changes for DRTVWR-174
Diffstat (limited to 'indra')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llavatariconctrl.cpp | 0 | ||||
| -rw-r--r-- | indra/newview/llmarketplacefunctions.cpp | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llmeshrepository.cpp | 0 |
3 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp index b539ac38ed..b539ac38ed 100644..100755 --- a/indra/newview/llavatariconctrl.cpp +++ b/indra/newview/llavatariconctrl.cpp 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); + } } } diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index bc7f522848..bc7f522848 100644..100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp |