aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs6
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs6
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 7c8e226..4e9cf1c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -242,7 +242,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
242 if (maxRTO != 0) 242 if (maxRTO != 0)
243 m_maxRTO = maxRTO; 243 m_maxRTO = maxRTO;
244 244
245 m_burstTime = rates.BrustTime; 245 m_burstTime = rates.BurstTime;
246 float m_burst = rates.ClientMaxRate * m_burstTime; 246 float m_burst = rates.ClientMaxRate * m_burstTime;
247 247
248 // Create a token bucket throttle for this client that has the scene token bucket as a parent 248 // Create a token bucket throttle for this client that has the scene token bucket as a parent
@@ -251,7 +251,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
251 // Create an array of token buckets for this clients different throttle categories 251 // Create an array of token buckets for this clients different throttle categories
252 m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT]; 252 m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT];
253 253
254 m_burst = rates.Total * rates.BrustTime; 254 m_burst = rates.Total * rates.BurstTime;
255 255
256 for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++) 256 for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++)
257 { 257 {
@@ -262,7 +262,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
262 // Initialize the token buckets that control the throttling for each category 262 // Initialize the token buckets that control the throttling for each category
263 //m_throttleCategories[i] = new TokenBucket(m_throttleClient, rates.GetRate(type), m_burst); 263 //m_throttleCategories[i] = new TokenBucket(m_throttleClient, rates.GetRate(type), m_burst);
264 float rate = rates.GetRate(type); 264 float rate = rates.GetRate(type);
265 float burst = rate * rates.BrustTime; 265 float burst = rate * rates.BurstTime;
266 m_throttleCategories[i] = new TokenBucket(m_throttleClient, rate , burst); 266 m_throttleCategories[i] = new TokenBucket(m_throttleClient, rate , burst);
267 } 267 }
268 268
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
index 3277638..707acdd 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
67 public Int64 MinimumAdaptiveThrottleRate; 67 public Int64 MinimumAdaptiveThrottleRate;
68 68
69 public int ClientMaxRate; 69 public int ClientMaxRate;
70 public float BrustTime; 70 public float BurstTime;
71 71
72 /// <summary> 72 /// <summary>
73 /// Default constructor 73 /// Default constructor
@@ -94,8 +94,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
94 if (ClientMaxRate > 1000000) 94 if (ClientMaxRate > 1000000)
95 ClientMaxRate = 1000000; // no more than 8Mbps 95 ClientMaxRate = 1000000; // no more than 8Mbps
96 96
97 BrustTime = (float)throttleConfig.GetInt("client_throttle_burtsTimeMS", 10); 97 BurstTime = (float)throttleConfig.GetInt("client_throttle_burtsTimeMS", 10);
98 BrustTime *= 1e-3f; 98 BurstTime *= 1e-3f;
99 99
100 // Adaptive is broken 100 // Adaptive is broken
101// AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false); 101// AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false);