aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorMic Bowman2014-12-30 16:26:57 -0800
committerMic Bowman2014-12-30 16:26:57 -0800
commitbc7570e59c17a60ed8941477f30f1f0a8fecd4e2 (patch)
treeed5058b26d067d992fac9696f7f394106025cf46 /bin/OpenSimDefaults.ini
parentRenamed VERSION_NUMBER to VersionNumber (diff)
parentComment out the debugging statements added in the last commit. Keeping (diff)
downloadopensim-SC-bc7570e59c17a60ed8941477f30f1f0a8fecd4e2.zip
opensim-SC-bc7570e59c17a60ed8941477f30f1f0a8fecd4e2.tar.gz
opensim-SC-bc7570e59c17a60ed8941477f30f1f0a8fecd4e2.tar.bz2
opensim-SC-bc7570e59c17a60ed8941477f30f1f0a8fecd4e2.tar.xz
Merge branch 'mb-throttle-test'
Merge in the new throttle code.
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini7
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3e9514e..212baab 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