summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-09-16 18:41:19 -0400
committerLoren Shih <seraph@lindenlab.com>2010-09-16 18:41:19 -0400
commitb5863a7723311ace7b288bc1eb6926b1221262ca (patch)
treed0b046426e90dbdf3edf27ee751536ef0b17c4e8 /indra/newview/app_settings
parent7ef0e0b92ff60f97f115df5779e574de2624159c (diff)
parentb5ea8b6046b2634cd0ef0ca2d7c3ac8079529e90 (diff)
Automated merge from viewer-development-shining
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2a0e23b1dc..3064e90bcd 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5860,6 +5860,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>ObjectCacheEnabled</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable the object cache.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>OpenDebugStatAdvanced</key>
<map>
<key>Comment</key>