diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-14 17:46:53 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-14 17:46:53 -0500 |
| commit | f125039abcb566eaa7bdf33ce9c8c550cc25783a (patch) | |
| tree | af4d577b9559855177bd0e24f95ee90976e6e8e0 /indra/newview/app_settings | |
| parent | 4cc5f81ddf0b9a190235e8946d7e438499d91639 (diff) | |
| parent | 93f827ec7855c419c19dbf1a055e7cdc546eb650 (diff) | |
merge with avatar-pipeline
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 289e900eaf..eed84671c1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5515,6 +5515,28 @@ <key>Value</key> <real>5.0</real> </map> + <key>PrimMediaMaxSortedQueueSize</key> + <map> + <key>Comment</key> + <string>Maximum number of objects the viewer will load media for initially</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>100000</integer> + </map> + <key>PrimMediaMaxRoundRobinQueueSize</key> + <map> + <key>Comment</key> + <string>Maximum number of objects the viewer will continuously update media for</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>100000</integer> + </map> <key>ProbeHardwareOnStartup</key> <map> <key>Comment</key> |