diff options
author | Sean Dague | 2007-11-28 18:39:07 +0000 |
---|---|---|
committer | Sean Dague | 2007-11-28 18:39:07 +0000 |
commit | 40dc1ac3b01819caa64795b92d2bb217be9e6a3e (patch) | |
tree | 257dbb2b94f39b79390a58d98e60f5f12ab03452 | |
parent | update prebuild (diff) | |
download | opensim-SC-40dc1ac3b01819caa64795b92d2bb217be9e6a3e.zip opensim-SC-40dc1ac3b01819caa64795b92d2bb217be9e6a3e.tar.gz opensim-SC-40dc1ac3b01819caa64795b92d2bb217be9e6a3e.tar.bz2 opensim-SC-40dc1ac3b01819caa64795b92d2bb217be9e6a3e.tar.xz |
I believe this turns throttling back on. I had expected
that the Queue would come in by reference, but it didn't
appear to be.
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 0933453..f9c1ff1 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -2358,7 +2358,7 @@ namespace OpenSim.Region.ClientStack | |||
2358 | } | 2358 | } |
2359 | } | 2359 | } |
2360 | 2360 | ||
2361 | private void ThrottleCheck(ref int TypeBytesSent, int Throttle, Queue<QueItem> q, QueItem item) | 2361 | private void ThrottleCheck(ref int TypeBytesSent, int Throttle, ref Queue<QueItem> q, QueItem item) |
2362 | { | 2362 | { |
2363 | // The idea.. is if the packet throttle queues are empty | 2363 | // The idea.. is if the packet throttle queues are empty |
2364 | // and the client is under throttle for the type. Queue | 2364 | // and the client is under throttle for the type. Queue |
@@ -2390,25 +2390,25 @@ namespace OpenSim.Region.ClientStack | |||
2390 | switch (throttlePacketType) | 2390 | switch (throttlePacketType) |
2391 | { | 2391 | { |
2392 | case ThrottleOutPacketType.Resend: | 2392 | case ThrottleOutPacketType.Resend: |
2393 | ThrottleCheck(ref ResendBytesSent, ResendthrottleOutbound, ResendOutgoingPacketQueue, item); | 2393 | ThrottleCheck(ref ResendBytesSent, ResendthrottleOutbound, ref ResendOutgoingPacketQueue, item); |
2394 | break; | 2394 | break; |
2395 | case ThrottleOutPacketType.Texture: | 2395 | case ThrottleOutPacketType.Texture: |
2396 | ThrottleCheck(ref TextureBytesSent, TexturethrottleOutbound, TextureOutgoingPacketQueue, item); | 2396 | ThrottleCheck(ref TextureBytesSent, TexturethrottleOutbound, ref TextureOutgoingPacketQueue, item); |
2397 | break; | 2397 | break; |
2398 | case ThrottleOutPacketType.Task: | 2398 | case ThrottleOutPacketType.Task: |
2399 | ThrottleCheck(ref TaskBytesSent, TaskthrottleOutbound, TaskOutgoingPacketQueue, item); | 2399 | ThrottleCheck(ref TaskBytesSent, TaskthrottleOutbound, ref TaskOutgoingPacketQueue, item); |
2400 | break; | 2400 | break; |
2401 | case ThrottleOutPacketType.Land: | 2401 | case ThrottleOutPacketType.Land: |
2402 | ThrottleCheck(ref LandBytesSent, LandthrottleOutbound, LandOutgoingPacketQueue, item); | 2402 | ThrottleCheck(ref LandBytesSent, LandthrottleOutbound, ref LandOutgoingPacketQueue, item); |
2403 | break; | 2403 | break; |
2404 | case ThrottleOutPacketType.Asset: | 2404 | case ThrottleOutPacketType.Asset: |
2405 | ThrottleCheck(ref AssetBytesSent, AssetthrottleOutbound, AssetOutgoingPacketQueue, item); | 2405 | ThrottleCheck(ref AssetBytesSent, AssetthrottleOutbound, ref AssetOutgoingPacketQueue, item); |
2406 | break; | 2406 | break; |
2407 | case ThrottleOutPacketType.Cloud: | 2407 | case ThrottleOutPacketType.Cloud: |
2408 | ThrottleCheck(ref CloudBytesSent, CloudthrottleOutbound, CloudOutgoingPacketQueue, item); | 2408 | ThrottleCheck(ref CloudBytesSent, CloudthrottleOutbound, ref CloudOutgoingPacketQueue, item); |
2409 | break; | 2409 | break; |
2410 | case ThrottleOutPacketType.Wind: | 2410 | case ThrottleOutPacketType.Wind: |
2411 | ThrottleCheck(ref WindBytesSent, WindthrottleOutbound, WindOutgoingPacketQueue, item); | 2411 | ThrottleCheck(ref WindBytesSent, WindthrottleOutbound, ref WindOutgoingPacketQueue, item); |
2412 | break; | 2412 | break; |
2413 | 2413 | ||
2414 | default: | 2414 | default: |