diff options
author | John Hurliman | 2009-09-30 15:28:23 -0700 |
---|---|---|
committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | |
parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index 798c1e7..c427870 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | |||
@@ -143,7 +143,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
143 | TextureThrottle = new LLPacketThrottle(1000, throttleMaxBPS / 2, 4000, userSettings.ClientThrottleMultipler); | 143 | TextureThrottle = new LLPacketThrottle(1000, throttleMaxBPS / 2, 4000, userSettings.ClientThrottleMultipler); |
144 | 144 | ||
145 | 145 | ||
146 | // Total Throttle trumps all - it is the number of bits in total that are allowed to go out per second. | 146 | // Total Throttle trumps all - it is the number of bits in total that are allowed to go out per second. |
147 | 147 | ||
148 | 148 | ||
149 | ThrottleSettings totalThrottleSettings = userSettings.TotalThrottleSettings; | 149 | ThrottleSettings totalThrottleSettings = userSettings.TotalThrottleSettings; |
@@ -410,7 +410,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
410 | { | 410 | { |
411 | LLQueItem qpack = ResendOutgoingPacketQueue.Dequeue(); | 411 | LLQueItem qpack = ResendOutgoingPacketQueue.Dequeue(); |
412 | 412 | ||
413 | SendQueue.Enqueue(qpack); | 413 | SendQueue.Enqueue(qpack); |
414 | TotalThrottle.AddBytes(qpack.Length); | 414 | TotalThrottle.AddBytes(qpack.Length); |
415 | ResendThrottle.AddBytes(qpack.Length); | 415 | ResendThrottle.AddBytes(qpack.Length); |
416 | 416 | ||
@@ -470,7 +470,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
470 | { | 470 | { |
471 | LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue(); | 471 | LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue(); |
472 | 472 | ||
473 | SendQueue.Enqueue(qpack); | 473 | SendQueue.Enqueue(qpack); |
474 | TotalThrottle.AddBytes(qpack.Length); | 474 | TotalThrottle.AddBytes(qpack.Length); |
475 | TextureThrottle.AddBytes(qpack.Length); | 475 | TextureThrottle.AddBytes(qpack.Length); |
476 | qchanged = true; | 476 | qchanged = true; |