summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-12-12 12:48:59 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-12-12 12:48:59 -0800
commit78b7a4b37c4762ea9503c1da0f79ab8fc412c2b9 (patch)
treeb252cc03e1cbee6e705b3339c61fa8979a9cadf7 /indra/newview/app_settings/settings.xml
parent3d7aaaada853d950888a2fd0fe3e2f375bd5bbb0 (diff)
parenta334f41f8ebec5ef812334e5086e54256e2bf7df (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
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 423e5a00df..3e0de834b4 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14290,5 +14290,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>