summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-01-04 10:23:22 -0500
committerOz Linden <oz@lindenlab.com>2013-01-04 10:23:22 -0500
commitb75fc0af897124a05ab3842bdfc60f428d22e051 (patch)
tree3cce57b84110720ea15f370b496d1bc6340a154f /indra/newview/app_settings/settings.xml
parent584b615c3444fdeaa0d41f1d9e839edf1518a310 (diff)
parentdef472b45cb17dd125f802dc3be85450135537a8 (diff)
merge up to 3.4.4 beta
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-xindra/newview/app_settings/settings.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 199e4f459d..7deb1284b9 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14070,5 +14070,17 @@
<real>1.0</real>
</array>
</map>
+
+ <key>SimulateFBOFailure</key>
+ <map>
+ <key>Comment</key>
+ <string>[DEBUG] Make allocateScreenBuffer return false. Used to test error handling.</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
</map>
</llsd>