merge up to latest viewer-development

1 files changed, 11 insertions, 5 deletions

diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 93dd82957f..0b009b68f7 100644
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -47,16 +47,16 @@ static std::string getMarketplaceDomain()
 	
 	if (!LLGridManager::getInstance()->isInProductionGrid())
 	{
-		const std::string& grid_label = LLGridManager::getInstance()->getGridLabel();
-		const std::string& grid_label_lower = utf8str_tolower(grid_label);
+		const std::string& grid_id = LLGridManager::getInstance()->getGridId();
+		const std::string& grid_id_lower = utf8str_tolower(grid_id);
 		
-		if (grid_label_lower == "damballah")
+		if (grid_id_lower == "damballah")
 		{
 			domain = "secondlife-staging.com";
 		}
 		else
 		{
-			domain = llformat("%s.lindenlab.com", grid_label_lower.c_str());
+			domain = llformat("%s.lindenlab.com", grid_id_lower.c_str());
 		}
 	}
 	
@@ -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);
+		}
 	}
 }