aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-03 18:33:35 +0000
committerJustin Clarke Casey2008-11-03 18:33:35 +0000
commit8c71954e0892958da444ef5c82173262daa3f46c (patch)
tree6e06070ae11dbfd6a84b1ae7995e6df6275f892e /OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
parentcompleting move to refactored multi-channel capable IRCBridgeModule (diff)
downloadopensim-SC_OLD-8c71954e0892958da444ef5c82173262daa3f46c.zip
opensim-SC_OLD-8c71954e0892958da444ef5c82173262daa3f46c.tar.gz
opensim-SC_OLD-8c71954e0892958da444ef5c82173262daa3f46c.tar.bz2
opensim-SC_OLD-8c71954e0892958da444ef5c82173262daa3f46c.tar.xz
* Use nini to pass config information to the client stack, rather than the ClientStackUserSettings class
* This conforms better to other module usage
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index bf95045..9abde5d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -322,6 +322,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
322 TotalThrottle.AddBytes(qpack.Packet.ToBytes().Length); 322 TotalThrottle.AddBytes(qpack.Packet.ToBytes().Length);
323 ResendThrottle.AddBytes(qpack.Packet.ToBytes().Length); 323 ResendThrottle.AddBytes(qpack.Packet.ToBytes().Length);
324 } 324 }
325
325 if (LandThrottle.UnderLimit() && LandOutgoingPacketQueue.Count > 0) 326 if (LandThrottle.UnderLimit() && LandOutgoingPacketQueue.Count > 0)
326 { 327 {
327 LLQueItem qpack = LandOutgoingPacketQueue.Dequeue(); 328 LLQueItem qpack = LandOutgoingPacketQueue.Dequeue();
@@ -330,6 +331,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
330 TotalThrottle.AddBytes(qpack.Packet.ToBytes().Length); 331 TotalThrottle.AddBytes(qpack.Packet.ToBytes().Length);
331 LandThrottle.AddBytes(qpack.Packet.ToBytes().Length); 332 LandThrottle.AddBytes(qpack.Packet.ToBytes().Length);
332 } 333 }
334
333 if (WindThrottle.UnderLimit() && WindOutgoingPacketQueue.Count > 0) 335 if (WindThrottle.UnderLimit() && WindOutgoingPacketQueue.Count > 0)
334 { 336 {
335 LLQueItem qpack = WindOutgoingPacketQueue.Dequeue(); 337 LLQueItem qpack = WindOutgoingPacketQueue.Dequeue();
@@ -338,6 +340,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
338 TotalThrottle.AddBytes(qpack.Packet.ToBytes().Length); 340 TotalThrottle.AddBytes(qpack.Packet.ToBytes().Length);
339 WindThrottle.AddBytes(qpack.Packet.ToBytes().Length); 341 WindThrottle.AddBytes(qpack.Packet.ToBytes().Length);
340 } 342 }
343
341 if (CloudThrottle.UnderLimit() && CloudOutgoingPacketQueue.Count > 0) 344 if (CloudThrottle.UnderLimit() && CloudOutgoingPacketQueue.Count > 0)
342 { 345 {
343 LLQueItem qpack = CloudOutgoingPacketQueue.Dequeue(); 346 LLQueItem qpack = CloudOutgoingPacketQueue.Dequeue();
@@ -346,6 +349,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
346 TotalThrottle.AddBytes(qpack.Packet.ToBytes().Length); 349 TotalThrottle.AddBytes(qpack.Packet.ToBytes().Length);
347 CloudThrottle.AddBytes(qpack.Packet.ToBytes().Length); 350 CloudThrottle.AddBytes(qpack.Packet.ToBytes().Length);
348 } 351 }
352
349 if (TaskThrottle.UnderLimit() && (TaskOutgoingPacketQueue.Count > 0 || TaskLowpriorityPacketQueue.Count > 0)) 353 if (TaskThrottle.UnderLimit() && (TaskOutgoingPacketQueue.Count > 0 || TaskLowpriorityPacketQueue.Count > 0))
350 { 354 {
351 LLQueItem qpack; 355 LLQueItem qpack;
@@ -362,6 +366,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
362 TotalThrottle.AddBytes(qpack.Packet.ToBytes().Length); 366 TotalThrottle.AddBytes(qpack.Packet.ToBytes().Length);
363 TaskThrottle.AddBytes(qpack.Packet.ToBytes().Length); 367 TaskThrottle.AddBytes(qpack.Packet.ToBytes().Length);
364 } 368 }
369
365 if (TextureThrottle.UnderLimit() && TextureOutgoingPacketQueue.Count > 0) 370 if (TextureThrottle.UnderLimit() && TextureOutgoingPacketQueue.Count > 0)
366 { 371 {
367 LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue(); 372 LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue();
@@ -370,6 +375,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
370 TotalThrottle.AddBytes(qpack.Packet.ToBytes().Length); 375 TotalThrottle.AddBytes(qpack.Packet.ToBytes().Length);
371 TextureThrottle.AddBytes(qpack.Packet.ToBytes().Length); 376 TextureThrottle.AddBytes(qpack.Packet.ToBytes().Length);
372 } 377 }
378
373 if (AssetThrottle.UnderLimit() && AssetOutgoingPacketQueue.Count > 0) 379 if (AssetThrottle.UnderLimit() && AssetOutgoingPacketQueue.Count > 0)
374 { 380 {
375 LLQueItem qpack = AssetOutgoingPacketQueue.Dequeue(); 381 LLQueItem qpack = AssetOutgoingPacketQueue.Dequeue();