From 73f6534d5e2c6a637f34ffa891db1ea2acea8d3c Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Sat, 15 Feb 2014 13:10:12 -0800
Subject: [PATCH] Add cache control to GetMesh2

---
 indra/newview/llmeshrepository.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 4cedce0016..a95a271c2f 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -3208,7 +3208,11 @@ void LLMeshRepository::notifyLoadedMeshes()
 	{
 		// GetMesh2 operation with keepalives, etc.  With pipelining,
 		// we'll increase this.
-		LLMeshRepoThread::sMaxConcurrentRequests = gSavedSettings.getU32("Mesh2MaxConcurrentRequests");
+		// <FS:TM> Use faster LLCachedControls for frequently visited locations
+		//LLMeshRepoThread::sMaxConcurrentRequests = gSavedSettings.getU32("Mesh2MaxConcurrentRequests");
+		static LLCachedControl<U32> mesh2MaxConcurrentRequests(gSavedSettings, "Mesh2MaxConcurrentRequests");
+		LLMeshRepoThread::sMaxConcurrentRequests = (U32)mesh2MaxConcurrentRequests;
+		// </FS:TM>
 		LLMeshRepoThread::sRequestHighWater = llclamp(5 * S32(LLMeshRepoThread::sMaxConcurrentRequests),
 													  REQUEST2_HIGH_WATER_MIN,
 													  REQUEST2_HIGH_WATER_MAX);