diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs index 8c42ca4..9476eed 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs | |||
@@ -297,14 +297,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
297 | 297 | ||
298 | // Make sure none of the throttles are set below our packet MTU, | 298 | // Make sure none of the throttles are set below our packet MTU, |
299 | // otherwise a throttle could become permanently clogged | 299 | // otherwise a throttle could become permanently clogged |
300 | resend = Math.Max(resend, Packet.MTU); | 300 | resend = Math.Max(resend, LLUDPServer.MTU); |
301 | land = Math.Max(land, Packet.MTU); | 301 | land = Math.Max(land, LLUDPServer.MTU); |
302 | wind = Math.Max(wind, Packet.MTU); | 302 | wind = Math.Max(wind, LLUDPServer.MTU); |
303 | cloud = Math.Max(cloud, Packet.MTU); | 303 | cloud = Math.Max(cloud, LLUDPServer.MTU); |
304 | task = Math.Max(task, Packet.MTU); | 304 | task = Math.Max(task, LLUDPServer.MTU); |
305 | texture = Math.Max(texture, Packet.MTU); | 305 | texture = Math.Max(texture, LLUDPServer.MTU); |
306 | asset = Math.Max(asset, Packet.MTU); | 306 | asset = Math.Max(asset, LLUDPServer.MTU); |
307 | state = Math.Max(state, Packet.MTU); | 307 | state = Math.Max(state, LLUDPServer.MTU); |
308 | 308 | ||
309 | int total = resend + land + wind + cloud + task + texture + asset + state; | 309 | int total = resend + land + wind + cloud + task + texture + asset + state; |
310 | 310 | ||
@@ -404,9 +404,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
404 | TokenBucket bucket; | 404 | TokenBucket bucket; |
405 | bool packetSent = false; | 405 | bool packetSent = false; |
406 | 406 | ||
407 | //string queueDebugOutput = String.Empty; // Serious debug business | ||
408 | |||
407 | for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++) | 409 | for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++) |
408 | { | 410 | { |
409 | bucket = m_throttleCategories[i]; | 411 | bucket = m_throttleCategories[i]; |
412 | //queueDebugOutput += m_packetOutboxes[i].Count + " "; // Serious debug business | ||
410 | 413 | ||
411 | if (m_nextPackets[i] != null) | 414 | if (m_nextPackets[i] != null) |
412 | { | 415 | { |
@@ -458,6 +461,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
458 | } | 461 | } |
459 | } | 462 | } |
460 | 463 | ||
464 | //m_log.Info("[LLUDPCLIENT]: Queues: " + queueDebugOutput); // Serious debug business | ||
461 | return packetSent; | 465 | return packetSent; |
462 | } | 466 | } |
463 | 467 | ||