From c17b476c9a9b99d79d84a2d3b375fa2706a704d9 Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Sun, 16 Oct 2011 09:17:52 -0700
Subject: [PATCH] SH-2276 Fix for TDR's on GTX 460 et al -- don't use texture
 units above 16 (workaround for prevalent driver bug) (from DaveP)

---
 indra/newview/app_settings/settings.xml | 2 +-
 indra/newview/featuretable.txt          | 1 +
 indra/newview/featuretable_linux.txt    | 1 +
 indra/newview/featuretable_mac.txt      | 1 +
 indra/newview/featuretable_xp.txt       | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ae711ed4d2..1e4cddb521 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10937,7 +10937,7 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <integer>32</integer>
+    <integer>16</integer>
   </map>
    <key>RunMultipleThreads</key>
     <map>
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 2b549e090e..46754dd877 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -64,6 +64,7 @@ RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
 WatchdogDisabled			1	1
 RenderUseStreamVBO			1	1
+RenderMaxTextureIndex		1	16
 
 //
 // Low Graphics Settings
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 9aa0d8fa0c..b1ce446cef 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -63,6 +63,7 @@ RenderDeferred				1	1
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
 RenderFSAASamples			1	0
+RenderMaxTextureIndex		1	16
 
 //
 // Low Graphics Settings
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 7ac48adafb..6a3175206f 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -70,6 +70,7 @@ WatchdogDisabled				1	1
 RenderUseFBO					1	1
 RenderDeferred					1	0
 RenderUseStreamVBO				1	0
+RenderMaxTextureIndex		1	16
 
 //
 // Low Graphics Settings
diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt
index c452802f35..6ec540b568 100644
--- a/indra/newview/featuretable_xp.txt
+++ b/indra/newview/featuretable_xp.txt
@@ -64,6 +64,7 @@ RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
 WatchdogDisabled			1	1
 RenderUseStreamVBO			1	1
+RenderMaxTextureIndex		1	16
 
 //
 // Low Graphics Settings