diff options
author | Diva Canto | 2014-12-30 20:05:33 -0800 |
---|---|---|
committer | Diva Canto | 2014-12-30 20:05:33 -0800 |
commit | 0af02efaed2e42f128f585b960550b0b8896c54f (patch) | |
tree | 886803e85dd278a62f9e42f3eca92d49bf785028 /bin/OpenSimDefaults.ini | |
parent | Add support for expansion of key values in nini config files. (diff) | |
parent | Merge branch 'mb-throttle-test' (diff) | |
download | opensim-SC_OLD-0af02efaed2e42f128f585b960550b0b8896c54f.zip opensim-SC_OLD-0af02efaed2e42f128f585b960550b0b8896c54f.tar.gz opensim-SC_OLD-0af02efaed2e42f128f585b960550b0b8896c54f.tar.bz2 opensim-SC_OLD-0af02efaed2e42f128f585b960550b0b8896c54f.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r-- | bin/OpenSimDefaults.ini | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 73fe59c..a1e24cf 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -544,6 +544,13 @@ | |||
544 | ; | 544 | ; |
545 | ;client_throttle_max_bps = 187500 | 545 | ;client_throttle_max_bps = 187500 |
546 | 546 | ||
547 | ; Minimum bytes per second to send to any single client as a result of | ||
548 | ; adaptive throttling. Viewer preferences set to a lower number will | ||
549 | ; override the settin. The example given here ensures that adaptive | ||
550 | ; throttling will never decrease per client bandwidth below 256 kbps. | ||
551 | ; | ||
552 | ;adaptive_throttle_min_bps = 32000 | ||
553 | |||
547 | ; Adaptive throttling attempts to limit network overload when multiple | 554 | ; Adaptive throttling attempts to limit network overload when multiple |
548 | ; clients login by starting each connection more slowly. Disabled by | 555 | ; clients login by starting each connection more slowly. Disabled by |
549 | ; default | 556 | ; default |