diff options
author | Callum Prentice <callum@lindenlab.com> | 2014-07-21 13:26:48 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2014-07-21 13:26:48 -0700 |
commit | c25105945a9d74e331cae4d827fc3be8d8915b7a (patch) | |
tree | 894c4f663fecc5659e2e1afbe7a815fd0b921f4f /indra/newview/app_settings/settings.xml | |
parent | f5c7d69317af103b5f5f762d7e0adb82f12a71b3 (diff) | |
parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) |
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 99158d1c71..174dd17b2a 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8046,6 +8046,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> @@ -15440,6 +15452,17 @@ <key>Value</key> <integer>7000</integer> </map> + <key>DisablePrecacheDelayAfterTeleporting</key> + <map> + <key>Comment</key> + <string>Disables the artificial delay in the viewer that precaches some incoming assets</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>VersionChannelName</key> <map> <key>Comment</key> |