From 22d20dbf17ca01128994d188721e8e4153700ff6 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 5 Nov 2016 19:17:25 +0000 Subject: [PATCH] disable bad/broken throttle options --- .../Region/ClientStack/Linden/UDP/ThrottleRates.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs index 076551fcb0..4448b7239c 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs @@ -100,11 +100,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP BrustTime = (float)throttleConfig.GetInt("client_throttle_burtsTimeMS", 10); BrustTime *= 1e-3f; - AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false); + // Adaptive is broken +// AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false); + AdaptiveThrottlesEnabled = false; MinimumAdaptiveThrottleRate = throttleConfig.GetInt("adaptive_throttle_min_bps", 32000); - CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f); - CannibalizeTextureRate = Util.Clamp(CannibalizeTextureRate,0.0, 0.9); + // http textures do use udp bandwith setting +// CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f); +// CannibalizeTextureRate = Util.Clamp(CannibalizeTextureRate,0.0, 0.9); + CannibalizeTextureRate = 0f; + } catch (Exception) { } }