1 files changed, 24 insertions, 1 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index ef1f34a..46d5610 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -83,6 +83,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         internal LLPacketThrottle TextureThrottle;
         internal LLPacketThrottle TotalThrottle;
         
+        private List<uint> contents = new List<uint>();
+
         /// <summary>
         /// The number of packets in the OutgoingPacketQueue
         /// 
@@ -186,6 +188,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 return;
             }
 
+            if (item.Sequence != 0)
+                contents.Add(item.Sequence);
+
             lock (this)
             {
                 switch (item.throttleType & ThrottleOutPacketType.TypeMask)
@@ -226,7 +231,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public LLQueItem Dequeue()
         {
-            return SendQueue.Dequeue();
+            while (true)
+            {
+                LLQueItem item = SendQueue.Dequeue();
+                if (item == null)
+                    return null;
+                if (item.Incoming)
+                    return item;
+                if (item.Sequence == 0)
+                    return item;
+                if (contents.Remove(item.Sequence))
+                    return item;
+            }
+        }
+
+        public void Cancel(uint sequence)
+        {
+            while(contents.Remove(sequence))
+                ;
         }
 
         public void Flush()
@@ -286,6 +308,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 TextureOutgoingPacketQueue.Clear();
                 AssetOutgoingPacketQueue.Clear();
                 SendQueue.Clear();
+                contents.Clear();
             }
         }