diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:48:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:48:30 -0400 |
| commit | df3e6b40fd80a139e745106231bc5c752271beea (patch) | |
| tree | c52227a2428060c5f3ffd7a1f97725c45adedb3a /indra/newview/app_settings/settings.xml | |
| parent | 8192a3c5b2addd63e1d5c12269eec7e6de2adde0 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
merge changes for 3.7.12-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 d2fbb822b1..03b953b6cc 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8023,6 +8023,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> @@ -15417,6 +15429,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> |