summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2014-03-11 17:42:02 -0500
committerDave Parks <davep@lindenlab.com>2014-03-11 17:42:02 -0500
commit02423199e89473c6aad2c6ab121d44c1f238dbd1 (patch)
tree4bb804729c65a892919ac5ae10a208c4dc0a9b1b /indra/newview/app_settings/settings.xml
parentcf2a180823e4e6daa0649ab54a5f7ed6ba14dbb2 (diff)
parent6abbe4cf55c2e4a6a879b00971bc5d70a7c58e8a (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
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 6ebda3ff6a..dfbf6b0156 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7982,6 +7982,18 @@
<integer>128</integer>
</map>
+ <key>OctreeMinimumNodeSize</key>
+ <map>
+ <key>Comment</key>
+ <string>Minimum size of any octree node</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>0.01</real>
+ </map>
+
<key>OctreeStaticObjectSizeFactor</key>
<map>
<key>Comment</key>