summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-12-05 12:05:33 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-12-05 12:05:33 -0500
commit377544c8b40f2d35ba7b29252ed471d19bb983e5 (patch)
tree0fb68b6d7f9ce04b7126d08365f0f6cb483e57f7 /indra/newview/app_settings/settings.xml
parentcc2c426e88bfff91c1da1704d5fdedee6e7e3dbb (diff)
parent5a938e3a1c8582d6bfe6df2aa195afcdcafb355a (diff)
merge changes for MAINT-1955, MAINT-1958
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>