diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-11-04 15:40:30 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-11-04 15:40:30 -0400 |
| commit | 7a5b92199598be0fc5a2702d071afda06e6ae59f (patch) | |
| tree | 989dbe8554b42f6c06038b01de1ea9686ab42434 /indra/newview/app_settings | |
| parent | 3faba7515c757ca3183522bd017c0f76d9c4581c (diff) | |
| parent | 8b16ecb9cfb4917fe38e4e5b0e4f40a23dd4ffbf (diff) | |
SL-16202: Merge branch 'sl-16220' into glthread
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 291f0f7d95..fb503f4f4a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3858,6 +3858,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>MainWorkTime</key> + <map> + <key>Comment</key> + <string>Max time per frame devoted to mainloop work queue (in milliseconds)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>0.1</real> + </map> <key>QueueInventoryFetchTimeout</key> <map> <key>Comment</key> @@ -12663,6 +12674,20 @@ <key>Value</key> <integer>50</integer> </map> + <key>ThreadPoolSizes</key> + <map> + <key>Comment</key> + <string>Map of size overrides for specific thread pools.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>LLSD</string> + <key>Value</key> + <map> + <key>General</key> + <integer>4</integer> + </map> + </map> <key>ThrottleBandwidthKBPS</key> <map> <key>Comment</key> |