diff options
author | UbitUmarov | 2016-11-05 19:17:25 +0000 |
---|---|---|
committer | UbitUmarov | 2016-11-05 19:17:25 +0000 |
commit | 22d20dbf17ca01128994d188721e8e4153700ff6 (patch) | |
tree | 57b45cc27548a8deefd8ba466c7c56bacc53d588 /OpenSim/Region/ClientStack | |
parent | Regression, really ??? (diff) | |
download | opensim-SC-22d20dbf17ca01128994d188721e8e4153700ff6.zip opensim-SC-22d20dbf17ca01128994d188721e8e4153700ff6.tar.gz opensim-SC-22d20dbf17ca01128994d188721e8e4153700ff6.tar.bz2 opensim-SC-22d20dbf17ca01128994d188721e8e4153700ff6.tar.xz |
disable bad/broken throttle options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs index 076551f..4448b72 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 | |||
100 | BrustTime = (float)throttleConfig.GetInt("client_throttle_burtsTimeMS", 10); | 100 | BrustTime = (float)throttleConfig.GetInt("client_throttle_burtsTimeMS", 10); |
101 | BrustTime *= 1e-3f; | 101 | BrustTime *= 1e-3f; |
102 | 102 | ||
103 | AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false); | 103 | // Adaptive is broken |
104 | // AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false); | ||
105 | AdaptiveThrottlesEnabled = false; | ||
104 | MinimumAdaptiveThrottleRate = throttleConfig.GetInt("adaptive_throttle_min_bps", 32000); | 106 | MinimumAdaptiveThrottleRate = throttleConfig.GetInt("adaptive_throttle_min_bps", 32000); |
105 | 107 | ||
106 | CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f); | 108 | // http textures do use udp bandwith setting |
107 | CannibalizeTextureRate = Util.Clamp<double>(CannibalizeTextureRate,0.0, 0.9); | 109 | // CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f); |
110 | // CannibalizeTextureRate = Util.Clamp<double>(CannibalizeTextureRate,0.0, 0.9); | ||
111 | CannibalizeTextureRate = 0f; | ||
112 | |||
108 | } | 113 | } |
109 | catch (Exception) { } | 114 | catch (Exception) { } |
110 | } | 115 | } |