diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index 194d1b4..81f3922 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | |||
@@ -334,7 +334,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
334 | { | 334 | { |
335 | throttleLoops++; | 335 | throttleLoops++; |
336 | //Now comes the fun part.. we dump all our elements into m_packetQueue that we've saved up. | 336 | //Now comes the fun part.. we dump all our elements into m_packetQueue that we've saved up. |
337 | if (ResendThrottle.UnderLimit() && ResendOutgoingPacketQueue.Count > 0) | 337 | if ((ResendOutgoingPacketQueue.Count > 0) && ResendThrottle.UnderLimit()) |
338 | { | 338 | { |
339 | LLQueItem qpack = ResendOutgoingPacketQueue.Dequeue(); | 339 | LLQueItem qpack = ResendOutgoingPacketQueue.Dequeue(); |
340 | 340 | ||
@@ -343,7 +343,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
343 | ResendThrottle.AddBytes(qpack.Packet.ToBytes().Length); | 343 | ResendThrottle.AddBytes(qpack.Packet.ToBytes().Length); |
344 | } | 344 | } |
345 | 345 | ||
346 | if (LandThrottle.UnderLimit() && LandOutgoingPacketQueue.Count > 0) | 346 | if ((LandOutgoingPacketQueue.Count > 0) && LandThrottle.UnderLimit()) |
347 | { | 347 | { |
348 | LLQueItem qpack = LandOutgoingPacketQueue.Dequeue(); | 348 | LLQueItem qpack = LandOutgoingPacketQueue.Dequeue(); |
349 | 349 | ||
@@ -352,7 +352,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
352 | LandThrottle.AddBytes(qpack.Packet.ToBytes().Length); | 352 | LandThrottle.AddBytes(qpack.Packet.ToBytes().Length); |
353 | } | 353 | } |
354 | 354 | ||
355 | if (WindThrottle.UnderLimit() && WindOutgoingPacketQueue.Count > 0) | 355 | if ((WindOutgoingPacketQueue.Count > 0) && WindThrottle.UnderLimit()) |
356 | { | 356 | { |
357 | LLQueItem qpack = WindOutgoingPacketQueue.Dequeue(); | 357 | LLQueItem qpack = WindOutgoingPacketQueue.Dequeue(); |
358 | 358 | ||
@@ -361,7 +361,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
361 | WindThrottle.AddBytes(qpack.Packet.ToBytes().Length); | 361 | WindThrottle.AddBytes(qpack.Packet.ToBytes().Length); |
362 | } | 362 | } |
363 | 363 | ||
364 | if (CloudThrottle.UnderLimit() && CloudOutgoingPacketQueue.Count > 0) | 364 | if ((CloudOutgoingPacketQueue.Count > 0) && CloudThrottle.UnderLimit()) |
365 | { | 365 | { |
366 | LLQueItem qpack = CloudOutgoingPacketQueue.Dequeue(); | 366 | LLQueItem qpack = CloudOutgoingPacketQueue.Dequeue(); |
367 | 367 | ||
@@ -370,7 +370,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
370 | CloudThrottle.AddBytes(qpack.Packet.ToBytes().Length); | 370 | CloudThrottle.AddBytes(qpack.Packet.ToBytes().Length); |
371 | } | 371 | } |
372 | 372 | ||
373 | if (TaskThrottle.UnderLimit() && (TaskOutgoingPacketQueue.Count > 0 || TaskLowpriorityPacketQueue.Count > 0)) | 373 | if ((TaskOutgoingPacketQueue.Count > 0 || TaskLowpriorityPacketQueue.Count > 0) && TaskThrottle.UnderLimit()) |
374 | { | 374 | { |
375 | LLQueItem qpack; | 375 | LLQueItem qpack; |
376 | if (TaskOutgoingPacketQueue.Count > 0) | 376 | if (TaskOutgoingPacketQueue.Count > 0) |
@@ -387,7 +387,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
387 | TaskThrottle.AddBytes(qpack.Packet.ToBytes().Length); | 387 | TaskThrottle.AddBytes(qpack.Packet.ToBytes().Length); |
388 | } | 388 | } |
389 | 389 | ||
390 | if (TextureThrottle.UnderLimit() && TextureOutgoingPacketQueue.Count > 0) | 390 | if ((TextureOutgoingPacketQueue.Count > 0) && TextureThrottle.UnderLimit()) |
391 | { | 391 | { |
392 | LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue(); | 392 | LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue(); |
393 | 393 | ||
@@ -396,7 +396,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
396 | TextureThrottle.AddBytes(qpack.Packet.ToBytes().Length); | 396 | TextureThrottle.AddBytes(qpack.Packet.ToBytes().Length); |
397 | } | 397 | } |
398 | 398 | ||
399 | if (AssetThrottle.UnderLimit() && AssetOutgoingPacketQueue.Count > 0) | 399 | if ((AssetOutgoingPacketQueue.Count > 0) && AssetThrottle.UnderLimit()) |
400 | { | 400 | { |
401 | LLQueItem qpack = AssetOutgoingPacketQueue.Dequeue(); | 401 | LLQueItem qpack = AssetOutgoingPacketQueue.Dequeue(); |
402 | 402 | ||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs index 5037ea5..f73892a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs | |||
@@ -115,4 +115,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
115 | } | 115 | } |
116 | } | 116 | } |
117 | } | 117 | } |
118 | } \ No newline at end of file | 118 | } |