aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
authorMic Bowman2011-04-11 09:06:28 -0700
committerMic Bowman2011-04-12 15:58:57 -0700
commit2f436875899f432a88f432ab86a6858b3a4cc373 (patch)
tree0b481b1e0baed8ea22c47bf4d2d81f565a7197fe /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
parentMove example HttpProxy setting to OpenSim.ini.example and tidy (diff)
downloadopensim-SC_OLD-2f436875899f432a88f432ab86a6858b3a4cc373.zip
opensim-SC_OLD-2f436875899f432a88f432ab86a6858b3a4cc373.tar.gz
opensim-SC_OLD-2f436875899f432a88f432ab86a6858b3a4cc373.tar.bz2
opensim-SC_OLD-2f436875899f432a88f432ab86a6858b3a4cc373.tar.xz
New tokenbucket algorithm. This one provides fair sharing of the queues
when client and simulator throttles are set. This algorithm also uses pre-defined burst rate of 150% of the sustained rate for each of the throttles. Removed the "state" queue. The state queue is not a Linden queue and appeared to be used just to get kill packets sent.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 8de31d7..934a2d5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1610,7 +1610,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1610 } 1610 }
1611 else 1611 else
1612 { 1612 {
1613 OutPacket(kill, ThrottleOutPacketType.State); 1613 // OutPacket(kill, ThrottleOutPacketType.State);
1614 OutPacket(kill, ThrottleOutPacketType.Task);
1614 } 1615 }
1615 } 1616 }
1616 1617
@@ -2440,7 +2441,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2440 2441
2441 packet.Effect = effectBlocks; 2442 packet.Effect = effectBlocks;
2442 2443
2443 OutPacket(packet, ThrottleOutPacketType.State); 2444 // OutPacket(packet, ThrottleOutPacketType.State);
2445 OutPacket(packet, ThrottleOutPacketType.Task);
2444 } 2446 }
2445 2447
2446 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, 2448 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember,