diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 10:09:03 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 10:09:03 -0400 |
commit | 3da45a3cd1e4a7984e2e41ab92ad9f97166aa3a6 (patch) | |
tree | be99785bd263e745020de6456e6449ca9da62f3d /indra/newview/app_settings | |
parent | 1716b8428f88989b2b8898e27cc137e7746a4805 (diff) | |
parent | 021ce5ccaf10e140fe114c586466ccea8ea7dbdf (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--[-rwxr-xr-x] | indra/newview/app_settings/settings.xml | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index cf07350d85..2372c19fb9 100755..100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5587,7 +5587,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <real>0</real> + <real>1</real> </map> <key>MeshUploadLogXML</key> <map> @@ -9145,28 +9145,51 @@ <key>Value</key> <real>1.0</real> </map> - <key>MeshStreamingCostScaler</key> + <key>MeshTriangleBudget</key> <map> <key>Comment</key> - <string>DEBUG</string> + <string>Target visible triangle budget to use when estimating streaming cost.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>F32</string> + <string>U32</string> <key>Value</key> - <real>2.0</real> + <real>250000</real> </map> - <key>MeshThreadCount</key> + <key>MeshMetaDataDiscount</key> <map> <key>Comment</key> - <string>Number of threads to use for loading meshes.</string> + <string>Number of bytes to deduct for metadata when determining streaming cost.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>U32</string> <key>Value</key> - <integer>8</integer> + <real>384</real> </map> + <key>MeshMinimumByteSize</key> + <map> + <key>Comment</key> + <string>Minimum number of bytes per LoD block when determining streaming cost.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <real>16</real> + </map> + <key>MeshBytesPerTriangle</key> + <map> + <key>Comment</key> + <string>Approximation of bytes per triangle to use for determining mesh streaming cost.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <real>16</real> + </map> + <key>MeshMaxConcurrentRequests</key> <map> <key>Comment</key> |