ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert 7754 and 7755 pending a rework

Browse Source
This commit is contained in:
Melanie Thielker
2008-12-17 20:34:37 +00:00
parent 5320f0f33c
commit 2bcf315ea2
3 changed files with 59 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
View File

@@ -345,8 +345,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLQueItem qpack = ResendOutgoingPacketQueue.Dequeue();
SendQueue.Enqueue(qpack);
TotalThrottle.AddBytes(qpack.Length);
ResendThrottle.AddBytes(qpack.Length);
int qpackSize = qpack.Packet.ToBytes().Length;
TotalThrottle.AddBytes(qpackSize);
ResendThrottle.AddBytes(qpackSize);
qchanged = true;
}
@@ -356,8 +357,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLQueItem qpack = LandOutgoingPacketQueue.Dequeue();
SendQueue.Enqueue(qpack);
TotalThrottle.AddBytes(qpack.Length);
LandThrottle.AddBytes(qpack.Length);
int qpackSize = qpack.Packet.ToBytes().Length;
TotalThrottle.AddBytes(qpackSize);
LandThrottle.AddBytes(qpackSize);
qchanged = true;
}
@@ -366,8 +368,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLQueItem qpack = WindOutgoingPacketQueue.Dequeue();
SendQueue.Enqueue(qpack);
TotalThrottle.AddBytes(qpack.Length);
WindThrottle.AddBytes(qpack.Length);
int qpackSize = qpack.Packet.ToBytes().Length;
TotalThrottle.AddBytes(qpackSize);
WindThrottle.AddBytes(qpackSize);
qchanged = true;
}
@@ -376,8 +379,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLQueItem qpack = CloudOutgoingPacketQueue.Dequeue();
SendQueue.Enqueue(qpack);
TotalThrottle.AddBytes(qpack.Length);
CloudThrottle.AddBytes(qpack.Length);
int qpackSize = qpack.Packet.ToBytes().Length;
TotalThrottle.AddBytes(qpackSize);
CloudThrottle.AddBytes(qpackSize);
qchanged = true;
}
@@ -395,8 +399,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
SendQueue.Enqueue(qpack);
}
TotalThrottle.AddBytes(qpack.Length);
TaskThrottle.AddBytes(qpack.Length);
int qpackSize = qpack.Packet.ToBytes().Length;
TotalThrottle.AddBytes(qpackSize);
TaskThrottle.AddBytes(qpackSize);
qchanged = true;
}
@@ -405,8 +410,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue();
SendQueue.Enqueue(qpack);
TotalThrottle.AddBytes(qpack.Length);
TextureThrottle.AddBytes(qpack.Length);
int qpackSize = qpack.Packet.ToBytes().Length;
TotalThrottle.AddBytes(qpackSize);
TextureThrottle.AddBytes(qpackSize);
qchanged = true;
}
@@ -415,8 +421,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLQueItem qpack = AssetOutgoingPacketQueue.Dequeue();
SendQueue.Enqueue(qpack);
TotalThrottle.AddBytes(qpack.Length);
AssetThrottle.AddBytes(qpack.Length);
int qpackSize = qpack.Packet.ToBytes().Length;
TotalThrottle.AddBytes(qpackSize);
AssetThrottle.AddBytes(qpackSize);
qchanged = true;
}
}
@@ -444,8 +451,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
try
{
Monitor.Enter(this);
throttle.AddBytes(item.Length);
TotalThrottle.AddBytes(item.Length);
throttle.AddBytes(item.Packet.ToBytes().Length);
TotalThrottle.AddBytes(item.Packet.ToBytes().Length);
SendQueue.Enqueue(item);
}
catch (Exception e)