Merge git://opensimulator.org/git/opensim

1 files changed, 17 insertions, 23 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 02fa7c5..8807444 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -362,30 +362,24 @@
     ;
     ;client_throttle_max_bps = 196608
 
-    ; Per-client bytes per second rates for the various throttle categories.
-    ; These are default values that will be overriden by clients
-    ;
-    ;resend_default = 12500
-    ;land_default = 1000
-    ;wind_default = 1000
-    ;cloud_default = 1000
-    ;task_default = 1000
-    ;texture_default = 1000
-    ;asset_default = 1000
-    ;state_default = 1000
-
-    ; Per-client maximum burst rates in bytes per second for the various
-    ; throttle categories. These are default values that will be overriden by
-    ; clients
+    ; Adaptive throttling attempts to limit network overload when multiple
+    ; clients login by starting each connection more slowly. Disabled by
+    ; default
     ;
-    ;resend_limit = 18750
-    ;land_limit = 29750
-    ;wind_limit = 18750
-    ;cloud_limit = 18750
-    ;task_limit = 18750
-    ;texture_limit = 55750
-    ;asset_limit = 27500
-    ;state_limit = 37000
+    ;enable_adaptive_throttles = true
+
+    ; Per-client bytes per second rates for the various throttle categories.
+    ; These are default values that will be overriden by clients. These
+    ; defaults are approximately equivalent to the throttles set by the Imprudence
+    ; viewer when maximum bandwidth is set to 350kbps
+
+    ;resend_default = 6625
+    ;land_default = 9125
+    ;wind_default = 1750
+    ;cloud_default = 1750
+    ;task_default = 18500
+    ;texture_default = 18500
+    ;asset_default = 10500
 
     ; Configures how ObjectUpdates are aggregated. These numbers
     ; do not literally mean how many updates will be put in each