From 5c7fe2eddfcd1837244be36905c5f0c4ea5b06db Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Fri, 25 Oct 2013 22:27:22 +0200
Subject: [PATCH] FIRE-11852; Disable memory probing via debug settings.

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llviewertexture.cpp       |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2fda08f1d8..e378cd65e9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -21613,6 +21613,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FSDisableAMDTextureMemoryCheck</key>
+    <map>
+      <key>Comment</key>
+      <string>Disable checking for low texture memory on AMD graphics cards</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
 </map>
 </llsd>
 
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 806e81f0a1..191d78fc9a 100755
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -459,6 +459,13 @@ bool LLViewerTexture::isMemoryForTextureLow()
 	const F32 WAIT_TIME = 1.0f ; //second
 	static LLFrameTimer timer ;
 
+	// <FS:ND> Disable memory checking on request
+	static LLCachedControl<bool> FSDisableMemCheck(gSavedSettings, "FSDisableAMDTextureMemoryCheck");
+
+	if( FSDisableMemCheck )
+		return false;
+	// </FS:ND>
+
 	if(timer.getElapsedTimeF32() < WAIT_TIME) //call this once per second.
 	{
 		return false;