aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
diff options
context:
space:
mode:
authorMelanie2009-10-02 08:23:38 +0100
committerMelanie2009-10-02 08:23:38 +0100
commit31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch)
treea2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
parentRestore the missing image handling to the image manager. The missing (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip
opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz
opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2
opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz
Merge branch 'master' into diva-textures
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 8484846..ff739c5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
133 TextureThrottle = new LLPacketThrottle(1000, throttleMaxBPS / 2, 4000, userSettings.ClientThrottleMultipler); 133 TextureThrottle = new LLPacketThrottle(1000, throttleMaxBPS / 2, 4000, userSettings.ClientThrottleMultipler);
134 134
135 135
136 // Total Throttle trumps all - it is the number of bits in total that are allowed to go out per second. 136 // Total Throttle trumps all - it is the number of bits in total that are allowed to go out per second.
137 137
138 138
139 ThrottleSettings totalThrottleSettings = userSettings.TotalThrottleSettings; 139 ThrottleSettings totalThrottleSettings = userSettings.TotalThrottleSettings;
@@ -419,7 +419,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
419 { 419 {
420 LLQueItem qpack = ResendOutgoingPacketQueue.Dequeue(); 420 LLQueItem qpack = ResendOutgoingPacketQueue.Dequeue();
421 421
422 SendQueue.Enqueue(qpack); 422 SendQueue.Enqueue(qpack);
423 TotalThrottle.AddBytes(qpack.Length); 423 TotalThrottle.AddBytes(qpack.Length);
424 ResendThrottle.AddBytes(qpack.Length); 424 ResendThrottle.AddBytes(qpack.Length);
425 425
@@ -491,7 +491,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
491 { 491 {
492 LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue(); 492 LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue();
493 493
494 SendQueue.Enqueue(qpack); 494 SendQueue.Enqueue(qpack);
495 TotalThrottle.AddBytes(qpack.Length); 495 TotalThrottle.AddBytes(qpack.Length);
496 TextureThrottle.AddBytes(qpack.Length); 496 TextureThrottle.AddBytes(qpack.Length);
497 qchanged = true; 497 qchanged = true;