diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/PacketQueue.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/PacketQueue.cs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/PacketQueue.cs b/OpenSim/Region/ClientStack/PacketQueue.cs index a04828f..82f96e8 100644 --- a/OpenSim/Region/ClientStack/PacketQueue.cs +++ b/OpenSim/Region/ClientStack/PacketQueue.cs | |||
@@ -142,8 +142,13 @@ namespace OpenSim.Region.ClientStack | |||
142 | // We could micro lock, but that will tend to actually | 142 | // We could micro lock, but that will tend to actually |
143 | // probably be worse than just synchronizing on SendQueue | 143 | // probably be worse than just synchronizing on SendQueue |
144 | 144 | ||
145 | lock (this) | 145 | if (item == null) |
146 | { | 146 | { |
147 | SendQueue.Enqueue(item); | ||
148 | return; | ||
149 | } | ||
150 | |||
151 | lock (this) { | ||
147 | switch (item.throttleType) | 152 | switch (item.throttleType) |
148 | { | 153 | { |
149 | case ThrottleOutPacketType.Resend: | 154 | case ThrottleOutPacketType.Resend: |
@@ -518,5 +523,10 @@ namespace OpenSim.Region.ClientStack | |||
518 | TextureOutgoingPacketQueue.Count, | 523 | TextureOutgoingPacketQueue.Count, |
519 | AssetOutgoingPacketQueue.Count); | 524 | AssetOutgoingPacketQueue.Count); |
520 | } | 525 | } |
526 | |||
527 | public QueItem[] GetQueueArray() | ||
528 | { | ||
529 | return SendQueue.GetQueueArray(); | ||
530 | } | ||
521 | } | 531 | } |
522 | } | 532 | } |