diff options
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 | 
