Don't call getCapability from a background thread.

2 files changed, 9 insertions, 1 deletions

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 72019d8de8..1885b48812 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -645,7 +645,7 @@ std::string LLMeshRepoThread::constructUrl(LLUUID mesh_id)
 	
 	if (gAgent.getRegion())
 	{
-		http_url = gAgent.getRegion()->getCapability("GetMesh");
+		http_url = gMeshRepo.mGetMeshCapability; 
 		scrub_host_name(http_url, gAgent.getRegionHost());
 	}
 
@@ -2275,6 +2275,12 @@ void LLMeshRepository::notifyLoadedMeshes()
 		return;
 	}
 
+	if (gAgent.getRegion())
+	{ //update capability url 
+		//TODO: only do this when region changes
+		mGetMeshCapability = gAgent.getRegion()->getCapability("GetMesh");
+	}
+
 	LLFastTimer t(FTM_MESH_UPDATE);
 
 	{
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 427bcb8a75..df00c6c7aa 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -526,6 +526,8 @@ public:
 	void uploadError(LLSD& args);
 	void updateInventory(inventory_data data);
 
+	std::string mGetMeshCapability;
+
 };
 
 extern LLMeshRepository gMeshRepo;