Merge branch 'master' into vehicles

6 files changed, 564 insertions, 546 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs
index 32a4ad4..31f9580 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs
@@ -34,16 +34,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 {
     public delegate void PacketStats(int inPackets, int outPackets, int unAckedBytes);
     public delegate void PacketDrop(Packet pack, Object id);
+    public delegate void QueueEmpty(ThrottleOutPacketType queue);
     public delegate bool SynchronizeClientHandler(IScene scene, Packet packet, UUID agentID, ThrottleOutPacketType throttlePacketType);
 
     /// <summary>
     /// Interface to a class that handles all the activity involved with maintaining the client circuit (handling acks,
     /// resends, pings, etc.)
     /// </summary>
-    public interface ILLPacketHandler
+    public interface ILLPacketHandler : IDisposable
     {
         event PacketStats OnPacketStats;
         event PacketDrop OnPacketDrop;
+        event QueueEmpty OnQueueEmpty;
         SynchronizeClientHandler SynchronizeClient { set; }
 
         int PacketsReceived { get; }
@@ -70,12 +72,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         void OutPacket(Packet NewPack,
                        ThrottleOutPacketType throttlePacketType, Object id);
         LLPacketQueue PacketQueue { get; }
-        void Stop();
         void Flush();
         void Clear();
         ClientInfo GetClientInfo();
         void SetClientInfo(ClientInfo info);
         void AddImportantPacket(PacketType type);
         void RemoveImportantPacket(PacketType type);
+        int GetQueueCount(ThrottleOutPacketType queue);
     }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index 638c765..5f549b5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -38,40 +38,37 @@ using System.Reflection;
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
     /// <summary>
-    /// We use this class to store image data and associated request data and attributes
+    /// Stores information about a current texture download and a reference to the texture asset
     /// </summary>
     public class J2KImage
     {
+        private const int IMAGE_PACKET_SIZE = 1000;
+        private const int FIRST_PACKET_SIZE = 600;
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public double m_designatedPriorityKey;
-        public double m_requestedPriority = 0.0d;
-        public uint m_lastSequence = 0;
+        public uint m_lastSequence;
+        public float m_requestedPriority;
         public uint m_requestedPacketNumber;
         public sbyte m_requestedDiscardLevel;
         public UUID m_requestedUUID;
         public IJ2KDecoder m_j2kDecodeModule;
         public IAssetService m_assetCache;
-        public OpenJPEG.J2KLayerInfo[] Layers = new OpenJPEG.J2KLayerInfo[0];
-        public AssetBase m_MissingSubstitute = null;
-        public bool m_decoded = false;
-        public bool m_completedSendAtCurrentDiscardLevel;
+        public OpenJPEG.J2KLayerInfo[] m_layers;
+        public bool m_decoded;
+        public bool m_hasasset;
+        public C5.IPriorityQueueHandle<J2KImage> m_priorityQueueHandle;
 
-        private sbyte m_discardLevel=-1;
         private uint m_packetNumber;
-        private bool m_decoderequested = false;
-        private bool m_hasasset = false;
-        private bool m_asset_requested = false;
-        private bool m_sentinfo = false;
-        private uint m_stopPacket = 0;
-        private const int cImagePacketSize = 1000;
-        private const int cFirstPacketSize = 600;
-        private AssetBase m_asset = null;
-        private LLImageManager m_image;
-        public J2KImage(LLImageManager image)
-        {
-            m_image = image;
-        }
+        private bool m_decoderequested;
+        private bool m_asset_requested;
+        private bool m_sentinfo;
+        private uint m_stopPacket;
+        private AssetBase m_asset;
+        private int m_assetDataLength;
+        private LLImageManager m_imageManager;
+
+        #region Properties
 
         public uint m_pPacketNumber
         {
@@ -84,10 +81,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public byte[] Data
         {
-            get 
-            { 
-                if (m_asset != null) 
-                    return m_asset.Data; 
+            get
+            {
+                if (m_asset != null)
+                    return m_asset.Data;
                 else
                     return null;
             }
@@ -97,9 +94,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             if (!m_decoded)
                 return 0;
+
             try
             {
-                return (ushort)(((m_asset.Data.Length - cFirstPacketSize + cImagePacketSize - 1) / cImagePacketSize) + 1);
+                return (ushort)(((m_assetDataLength - FIRST_PACKET_SIZE + IMAGE_PACKET_SIZE - 1) / IMAGE_PACKET_SIZE) + 1);
             }
             catch (Exception)
             {
@@ -110,119 +108,154 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-        public void J2KDecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers)
-        {
-           m_image.m_outstandingtextures++;
-           Layers = layers;
-           m_decoded = true;
-           RunUpdate();
-        }
+        #endregion Properties
 
-        public void AssetDataCallback(UUID AssetID, AssetBase asset)
+        public J2KImage(LLImageManager imageManager)
         {
-            m_hasasset = true;
-            if (asset == null || asset.Data == null)
-            {
-                m_asset = m_MissingSubstitute;
-            }
-            else
-            {
-                m_asset = asset;
-            }
-            RunUpdate();
+            m_imageManager = imageManager;
         }
 
-        protected void AssetReceived(string id, Object sender, AssetBase asset)
+        public bool SendPackets(LLClientView client, int maxpack)
         {
-            UUID assetID = UUID.Zero;
-            if (asset != null)
-                assetID = asset.FullID;
-
-            AssetDataCallback(assetID, asset);
-
-        }
+            if (m_packetNumber <= m_stopPacket)
+            {
+                bool SendMore = true;
+                if (!m_sentinfo || (m_packetNumber == 0))
+                {
+                    if (SendFirstPacket(client))
+                    {
+                        SendMore = false;
+                    }
+                    m_sentinfo = true;
+                    m_packetNumber++;
+                }
+                // bool ignoreStop = false;
+                if (m_packetNumber < 2)
+                {
+                    m_packetNumber = 2;
+                }
 
-        private int GetPacketForBytePosition(int bytePosition)
-        {
-            return ((bytePosition - cFirstPacketSize + cImagePacketSize - 1) / cImagePacketSize) + 1;
-        }
+                int count = 0;
+                while (SendMore && count < maxpack && m_packetNumber <= m_stopPacket)
+                {
+                    count++;
+                    SendMore = SendPacket(client);
+                    m_packetNumber++;
+                }
 
-        public int LastPacketSize()
-        {
-            if (m_packetNumber == 1)
-                return m_asset.Data.Length;
-            int lastsize = (m_asset.Data.Length - cFirstPacketSize) % cImagePacketSize;
-            //If the last packet size is zero, it's really cImagePacketSize, it sits on the boundary
-            if (lastsize == 0)
-            {
-                lastsize = cImagePacketSize;
+                if (m_packetNumber > m_stopPacket)
+                    return true;
             }
-            return lastsize;
-        }
- 
-        public int CurrentBytePosition()
-        {
-            if (m_packetNumber == 0)
-                return 0;
-            if (m_packetNumber == 1)
-                return cFirstPacketSize;
 
-            int result = cFirstPacketSize + ((int)m_packetNumber - 2) * cImagePacketSize;
-            if (result < 0)
-            {
-                result = cFirstPacketSize;
-            }
-            return result;
+            return false;
         }
 
-        public bool SendFirstPacket(LLClientView client)
+        public void RunUpdate()
         {
-            // this means we don't have 
-            if (Data == null) 
-            {
-                client.SendImageNotFound(m_requestedUUID);
-                m_log.WarnFormat("[TEXTURE]: Got null Data element on a asset {0}..  and the missing image Data property is al", m_requestedUUID);
-                return true;
-            }
-            // Do we have less then 1 packet's worth of data?
-            else if (m_asset.Data.Length <= cFirstPacketSize)
+            //This is where we decide what we need to update
+            //and assign the real discardLevel and packetNumber
+            //assuming of course that the connected client might be bonkers
+
+            if (!m_hasasset)
             {
-                // Send only 1 packet
-                client.SendImageFirstPart(1, m_requestedUUID, (uint)m_asset.Data.Length, m_asset.Data, 2);
-                m_stopPacket = 0;
-                return true;
+                if (!m_asset_requested)
+                {
+                    m_asset_requested = true;
+                    m_assetCache.Get(m_requestedUUID.ToString(), this, AssetReceived);
+                }
             }
             else
             {
-                byte[] firstImageData = new byte[cFirstPacketSize];
-                try 
-                { 
-                    Buffer.BlockCopy(m_asset.Data, 0, firstImageData, 0, (int)cFirstPacketSize);
-                    client.SendImageFirstPart(TexturePacketCount(), m_requestedUUID, (uint)m_asset.Data.Length, firstImageData, 2);
+                if (!m_decoded)
+                {
+                    //We need to decode the requested image first
+                    if (!m_decoderequested)
+                    {
+                        //Request decode
+                        m_decoderequested = true;
+                        // Do we have a jpeg decoder?
+                        if (m_j2kDecodeModule != null)
+                        {
+                            if (Data == null)
+                            {
+                                J2KDecodedCallback(m_requestedUUID, new OpenJPEG.J2KLayerInfo[0]);
+                            }
+                            else
+                            {
+                                // Send it off to the jpeg decoder
+                                m_j2kDecodeModule.BeginDecode(m_requestedUUID, Data, J2KDecodedCallback);
+                            }
+
+                        }
+                        else
+                        {
+                            J2KDecodedCallback(m_requestedUUID, new OpenJPEG.J2KLayerInfo[0]);
+                        }
+                    }
                 }
-                catch (Exception)
+                else
                 {
-                    m_log.Error("Texture block copy failed. Possibly out of memory?");
-                    return true;
+                    // Check for missing image asset data
+                    if (m_asset == null || m_asset.Data == null)
+                    {
+                        // FIXME:
+                        m_packetNumber = m_stopPacket;
+                        return;
+                    }
+
+                    if (m_requestedDiscardLevel >= 0 || m_stopPacket == 0)
+                    {
+                        int maxDiscardLevel = Math.Max(0, m_layers.Length - 1);
+
+                        // Treat initial texture downloads with a DiscardLevel of -1 a request for the highest DiscardLevel
+                        if (m_requestedDiscardLevel < 0 && m_stopPacket == 0)
+                            m_requestedDiscardLevel = (sbyte)maxDiscardLevel;
+
+                        // Clamp at the highest discard level
+                        m_requestedDiscardLevel = (sbyte)Math.Min(m_requestedDiscardLevel, maxDiscardLevel);
+
+                        //Calculate the m_stopPacket
+                        if (m_layers.Length > 0)
+                        {
+                            m_stopPacket = (uint)GetPacketForBytePosition(m_layers[(m_layers.Length - 1) - m_requestedDiscardLevel].End);
+                            //I don't know why, but the viewer seems to expect the final packet if the file
+                            //is just one packet bigger.
+                            if (TexturePacketCount() == m_stopPacket + 1)
+                            {
+                                m_stopPacket = TexturePacketCount();
+                            }
+                        }
+                        else
+                        {
+                            m_stopPacket = TexturePacketCount();
+                        }
+
+                        m_packetNumber = m_requestedPacketNumber;
+                    }
+
+                    if (m_imageManager.Client.PacketHandler.GetQueueCount(ThrottleOutPacketType.Texture) == 0)
+                    {
+                        //m_log.Debug("No textures queued, sending one packet to kickstart it");
+                        SendPacket(m_imageManager.Client);
+                    }
                 }
             }
-            return false;
         }
 
         private bool SendPacket(LLClientView client)
         {
             bool complete = false;
-            int imagePacketSize = ((int)m_packetNumber == (TexturePacketCount())) ? LastPacketSize() : cImagePacketSize;
+            int imagePacketSize = ((int)m_packetNumber == (TexturePacketCount())) ? LastPacketSize() : IMAGE_PACKET_SIZE;
 
             try
             {
-                if ((CurrentBytePosition() + cImagePacketSize) > m_asset.Data.Length)
+                if ((CurrentBytePosition() + IMAGE_PACKET_SIZE) > m_assetDataLength)
                 {
                     imagePacketSize = LastPacketSize();
-                    complete=true;
-                    if ((CurrentBytePosition() + imagePacketSize) > m_asset.Data.Length)
+                    complete = true;
+                    if ((CurrentBytePosition() + imagePacketSize) > m_assetDataLength)
                     {
-                        imagePacketSize = m_asset.Data.Length - CurrentBytePosition();
+                        imagePacketSize = m_assetDataLength - CurrentBytePosition();
                         complete = true;
                     }
                 }
@@ -244,7 +277,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
 
                     //Send the packet
-                    client.SendImageNextPart((ushort)(m_packetNumber-1), m_requestedUUID, imageData);
+                    client.SendImageNextPart((ushort)(m_packetNumber - 1), m_requestedUUID, imageData);
                 }
                 if (complete)
                 {
@@ -260,143 +293,115 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 return false;
             }
         }
-        public bool SendPackets(LLClientView client, int maxpack)
+
+        private int GetPacketForBytePosition(int bytePosition)
         {
+            return ((bytePosition - FIRST_PACKET_SIZE + IMAGE_PACKET_SIZE - 1) / IMAGE_PACKET_SIZE) + 1;
+        }
 
-            if (!m_completedSendAtCurrentDiscardLevel)
+        private int LastPacketSize()
+        {
+            if (m_packetNumber == 1)
+                return m_assetDataLength;
+            int lastsize = (m_assetDataLength - FIRST_PACKET_SIZE) % IMAGE_PACKET_SIZE;
+            //If the last packet size is zero, it's really cImagePacketSize, it sits on the boundary
+            if (lastsize == 0)
             {
-                if (m_packetNumber <= m_stopPacket)
-                {
-                    bool SendMore = true;
-                    if (!m_sentinfo || (m_packetNumber == 0))
-                    {
-                        if (SendFirstPacket(client))
-                        {
-                            SendMore = false;
-                        }
-                        m_sentinfo = true;
-                        m_packetNumber++;
-                    }
-                    // bool ignoreStop = false;
-                    if (m_packetNumber < 2)
-                    {
-                        m_packetNumber = 2;
-                    }
+                lastsize = IMAGE_PACKET_SIZE;
+            }
+            return lastsize;
+        }
 
-                    int count = 0;
-                    while (SendMore && count < maxpack && m_packetNumber <= m_stopPacket)
-                    {
-                        count++;
-                        SendMore = SendPacket(client);
-                        m_packetNumber++;
-                    }
+        private int CurrentBytePosition()
+        {
+            if (m_packetNumber == 0)
+                return 0;
+            if (m_packetNumber == 1)
+                return FIRST_PACKET_SIZE;
 
-                    if (m_packetNumber > m_stopPacket)
-                    {
-                        return true;
-                    }
+            int result = FIRST_PACKET_SIZE + ((int)m_packetNumber - 2) * IMAGE_PACKET_SIZE;
+            if (result < 0)
+            {
+                result = FIRST_PACKET_SIZE;
+            }
+            return result;
+        }
+
+        private bool SendFirstPacket(LLClientView client)
+        {
+            // this means we don't have 
+            if (Data == null)
+            {
+                client.SendImageNotFound(m_requestedUUID);
+                m_log.WarnFormat("[TEXTURE]: Got null Data element on a asset {0}..  and the missing image Data property is also null", m_requestedUUID);
+                return true;
+            }
+            // Do we have less then 1 packet's worth of data?
+            else if (m_assetDataLength <= FIRST_PACKET_SIZE)
+            {
+                // Send only 1 packet
+                client.SendImageFirstPart(1, m_requestedUUID, (uint)m_assetDataLength, m_asset.Data, 2);
+                m_stopPacket = 0;
+                return true;
+            }
+            else
+            {
+                byte[] firstImageData = new byte[FIRST_PACKET_SIZE];
+                try
+                {
+                    Buffer.BlockCopy(m_asset.Data, 0, firstImageData, 0, (int)FIRST_PACKET_SIZE);
+                    client.SendImageFirstPart(TexturePacketCount(), m_requestedUUID, (uint)m_assetDataLength, firstImageData, 2);
+                }
+                catch (Exception)
+                {
+                    m_log.Error("Texture block copy failed. Possibly out of memory?");
+                    return true;
                 }
             }
             return false;
         }
 
-        public void RunUpdate()
+        private void J2KDecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers)
         {
-            //This is where we decide what we need to update
-            //and assign the real discardLevel and packetNumber
-            //assuming of course that the connected client might be bonkers
+            m_layers = layers;
+            m_decoded = true;
+            RunUpdate();
+        }
 
-            if (!m_hasasset)
-            {
+        private void AssetDataCallback(UUID AssetID, AssetBase asset)
+        {
+            m_hasasset = true;
 
-                if (!m_asset_requested)
+            if (asset == null || asset.Data == null)
+            {
+                if (m_imageManager.MissingImage != null)
                 {
-                    m_asset_requested = true;
-                    m_assetCache.Get(m_requestedUUID.ToString(), this, AssetReceived);
-
+                    m_asset = m_imageManager.MissingImage;
+                    m_assetDataLength = m_asset.Data.Length;
+                }
+                else
+                {
+                    m_asset = null;
+                    m_decoded = true;
                 }
-
             }
             else
             {
+                m_asset = asset;
+                m_assetDataLength = m_asset.Data.Length;
+            }
 
+            RunUpdate();
+        }
 
-                if (!m_decoded)
-                {
-                    //We need to decode the requested image first
-                    if (!m_decoderequested)
-                    {
-                        //Request decode
-                        m_decoderequested = true;
-                        // Do we have a jpeg decoder?
-                        if (m_j2kDecodeModule != null)
-                        {
-                            if (Data == null)
-                            {
-                                J2KDecodedCallback(m_requestedUUID, new OpenJPEG.J2KLayerInfo[0]);
-                            }
-                            // Send it off to the jpeg decoder
-                            m_j2kDecodeModule.decode(m_requestedUUID, Data, J2KDecodedCallback);
-
-                        }
-                        else
-                        {
-                            J2KDecodedCallback(m_requestedUUID, new OpenJPEG.J2KLayerInfo[0]);
-                        }
-                    }
-
-                }
-                else
-                {
-                    //discardLevel of -1 means just update the priority
-                    if (m_requestedDiscardLevel != -1)
-                    {
-                        //Evaluate the discard level
-                        //First, is it positive?
-                        if (m_requestedDiscardLevel >= 0)
-                        {
-                            if (m_requestedDiscardLevel > Layers.Length - 1)
-                            {
-                                m_discardLevel = (sbyte)(Layers.Length - 1);
-                            }
-                            else
-                            {
-                                m_discardLevel = m_requestedDiscardLevel;
-                            }
+        private void AssetReceived(string id, Object sender, AssetBase asset)
+        {
+            UUID assetID = UUID.Zero;
+            if (asset != null)
+                assetID = asset.FullID;
 
-                            //Calculate the m_stopPacket
-                            if (Layers.Length > 0)
-                            {
-                                m_stopPacket = (uint)GetPacketForBytePosition(Layers[(Layers.Length - 1) - m_discardLevel].End);
-                                //I don't know why, but the viewer seems to expect the final packet if the file
-                                //is just one packet bigger.
-                                if (TexturePacketCount() == m_stopPacket + 1)
-                                {
-                                    m_stopPacket = TexturePacketCount();
-                                }
-                            }
-                            else
-                            {
-                                m_stopPacket = TexturePacketCount();
-                            }
-                            //Don't reset packet number unless we're waiting or it's ahead of us
-                            if (m_completedSendAtCurrentDiscardLevel || m_requestedPacketNumber>m_packetNumber)
-                            {
-                                m_packetNumber = m_requestedPacketNumber;
-                            }
+            AssetDataCallback(assetID, asset);
 
-                            if (m_packetNumber <= m_stopPacket)
-                            {
-                                m_completedSendAtCurrentDiscardLevel = false;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        m_packetNumber = m_stopPacket;
-                    }
-                }
-            }
         }
     }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 88ace6a..3b43771 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -81,8 +81,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private List<ObjectUpdatePacket.ObjectDataBlock> m_primFullUpdates =
                 new List<ObjectUpdatePacket.ObjectDataBlock>();
 
-        private Timer m_textureRequestTimer;
-
         private bool m_clientBlocked;
 
         private int m_probesWithNoIngressPackets;
@@ -143,9 +141,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         protected int m_primTerseUpdateRate = 10;
         protected int m_primFullUpdateRate = 14;
 
-        protected int m_textureRequestRate  = 100;
-        protected int m_textureSendLimit   = 10;
-        protected int m_textureDataLimit   = 5;
+        protected int m_textureSendLimit   = 20;
+        protected int m_textureDataLimit   = 10;
 
         protected int m_packetMTU = 1400;
 
@@ -534,6 +531,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_PacketHandler = new LLPacketHandler(this, m_networkServer, userSettings);
             m_PacketHandler.SynchronizeClient = SynchronizeClient;
             m_PacketHandler.OnPacketStats += PopulateStats;
+            m_PacketHandler.OnQueueEmpty += HandleQueueEmpty;
 
             if (scene.Config != null)
             {
@@ -555,9 +553,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     m_primFullUpdateRate = clientConfig.GetInt("FullUpdateRate",
                                                                m_primFullUpdateRate);
 
-                    m_textureRequestRate = clientConfig.GetInt("TextureRequestRate",
-                                                               m_textureRequestRate);
-
                     m_textureSendLimit = clientConfig.GetInt("TextureSendLimit",
                                                                m_textureSendLimit);
 
@@ -607,9 +602,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (m_primFullUpdateTimer.Enabled)
                 lock (m_primFullUpdateTimer)
                     m_primFullUpdateTimer.Stop();
-            if (m_textureRequestTimer.Enabled)
-                lock (m_textureRequestTimer)
-                    m_textureRequestTimer.Stop();
 
             // This is just to give the client a reasonable chance of
             // flushing out all it's packets.  There should probably
@@ -633,6 +625,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // of the client thread regardless of where Close() is called.
                 KillEndDone();
             }
+                        
+                        Terminate();
         }
 
         /// <summary>
@@ -704,10 +698,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (m_primFullUpdateTimer.Enabled)
                 lock (m_primFullUpdateTimer)
                     m_primFullUpdateTimer.Stop();
-
-            if (m_textureRequestTimer.Enabled)
-                lock (m_textureRequestTimer)
-                    m_textureRequestTimer.Stop();
         }
 
         public void Restart()
@@ -730,23 +720,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_primFullUpdateTimer = new Timer(m_primFullUpdateRate);
             m_primFullUpdateTimer.Elapsed += new ElapsedEventHandler(ProcessPrimFullUpdates);
             m_primFullUpdateTimer.AutoReset = false;
-
-            m_textureRequestTimer = new Timer(m_textureRequestRate);
-            m_textureRequestTimer.Elapsed += new ElapsedEventHandler(ProcessTextureRequests);
-            m_textureRequestTimer.AutoReset = false;
-
         }
 
-        public void Terminate()
+        private void Terminate()
         {
+                        IsActive = false;
+                        
+                        m_clientPingTimer.Close();
+                        m_avatarTerseUpdateTimer.Close();
+                        m_primTerseUpdateTimer.Close();
+                        m_primFullUpdateTimer.Close();
+                        
             m_PacketHandler.OnPacketStats -= PopulateStats;
-            m_PacketHandler.Stop();
+                        m_PacketHandler.Dispose();
 
             // wait for thread stoped
-            m_clientThread.Join();
+            // m_clientThread.Join();
 
             // delete circuit code
-            m_networkServer.CloseClient(this);
+            //m_networkServer.CloseClient(this);
         }
 
         #endregion
@@ -876,6 +868,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             while (IsActive)
             {
                 LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue();
+                                
+                                if (nextPacket == null) {
+                                        m_log.DebugFormat("[CLIENT]: PacketQueue return null LLQueItem");
+                                        continue;
+                                }
 
                 if (nextPacket.Incoming)
                 {
@@ -967,10 +964,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_primFullUpdateTimer.Elapsed += new ElapsedEventHandler(ProcessPrimFullUpdates);
             m_primFullUpdateTimer.AutoReset = false;
 
-            m_textureRequestTimer = new Timer(m_textureRequestRate);
-            m_textureRequestTimer.Elapsed += new ElapsedEventHandler(ProcessTextureRequests);
-            m_textureRequestTimer.AutoReset = false;
-
             m_scene.AddNewClient(this);
 
             RefreshGroupMembership();
@@ -1042,26 +1035,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-        protected virtual void TextureRequestHandler()
-        {
-            m_log.DebugFormat("[TRH] Thread started");
-           while (m_imageManager != null)
-            {
-                try
-                {
-                   while (m_imageManager != null)
-                    {
-                    }
-                }
-               catch (Exception e)
-                {
-                    m_log.WarnFormat("[TRH] Exception in handler loop: {0}", e.Message);
-                    m_log.Debug(e);
-                }
-            }
-            m_log.DebugFormat("[TRH] Thread terminated");
-        }
-
         # endregion
 
         // Previously ClientView.API partial class
@@ -3161,22 +3134,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-        // Unlike the other timers, this one is only started after
-        // the first request is seen.
-
-        void ProcessTextureRequests(object sender, ElapsedEventArgs e)
+        void HandleQueueEmpty(ThrottleOutPacketType queue)
         {
-            if (m_imageManager != null)
+            switch (queue)
             {
-                if (m_imageManager.ProcessImageQueue(m_textureSendLimit, 
-                                                     m_textureDataLimit))
-                {
-                    lock (m_textureRequestTimer)
-                        m_textureRequestTimer.Start();
-                }
+                case ThrottleOutPacketType.Texture:
+                    ProcessTextureRequests();
+                    break;
             }
         }
 
+        void ProcessTextureRequests()
+        {
+            if (m_imageManager != null)
+                m_imageManager.ProcessImageQueue(m_textureSendLimit, m_textureDataLimit);
+        }
+
         void ProcessPrimFullUpdates(object sender, ElapsedEventArgs e)
         {
             lock (m_primFullUpdates)
@@ -5275,13 +5248,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         // for the client session anyway, in order to protect ourselves against bad code in plugins
                         try
                         {
-                            List<byte> visualparams = new List<byte>();
-                            foreach (AgentSetAppearancePacket.VisualParamBlock x in appear.VisualParam)
-                            {
-                                visualparams.Add(x.ParamValue);
-                            }
+                            byte[] visualparams = new byte[appear.VisualParam.Length];
+                            for (int i = 0; i < appear.VisualParam.Length; i++)
+                                visualparams[i] = appear.VisualParam[i].ParamValue;
 
-                            handlerSetAppearance(appear.ObjectData.TextureEntry, visualparams);
+                            Primitive.TextureEntry te = null;
+                            if (appear.ObjectData.TextureEntry.Length > 1)
+                                te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length);
+
+                            handlerSetAppearance(te, visualparams);
                         }
                         catch (Exception e)
                         {
@@ -6624,8 +6599,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             if (m_imageManager != null)
                             {
                                 m_imageManager.EnqueueReq(args);
-                                lock (m_textureRequestTimer)
-                                    m_textureRequestTimer.Start();
                             }
                         }
                     }
@@ -11026,5 +10999,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         #endregion
+
+        public void SendRebakeAvatarTextures(UUID textureID)
+        {
+            RebakeAvatarTexturesPacket pack =
+                (RebakeAvatarTexturesPacket)PacketPool.Instance.GetPacket(PacketType.RebakeAvatarTextures);
+
+            pack.TextureData = new RebakeAvatarTexturesPacket.TextureDataBlock();
+            pack.TextureData.TextureID = textureID;
+            OutPacket(pack, ThrottleOutPacketType.Task);
+        }
     }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 295a5e6..a484fdf 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -27,58 +27,60 @@
 
 using System;
 using System.Threading;
+using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Services.Interfaces;
 using log4net;
-using System.Reflection;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
-
     public class LLImageManager
     {
-        
-        //Public interfaces:
-        //Constructor - (LLClientView, IAssetCache, IJ2KDecoder);
-        //void EnqueueReq - (TextureRequestArgs)
-        //ProcessImageQueue
-        //Close
+        private sealed class J2KImageComparer : IComparer<J2KImage>
+        {
+            public int Compare(J2KImage x, J2KImage y)
+            {
+                return x.m_requestedPriority.CompareTo(y.m_requestedPriority);
+            }
+        }
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private bool m_shuttingdown = false;
         private long m_lastloopprocessed = 0;
+        private AssetBase m_missingImage = null;
 
         private LLClientView m_client; //Client we're assigned to
         private IAssetService m_assetCache; //Asset Cache
         private IJ2KDecoder m_j2kDecodeModule; //Our J2K module
+        private C5.IntervalHeap<J2KImage> m_priorityQueue = new C5.IntervalHeap<J2KImage>(10, new J2KImageComparer());
 
-        private readonly AssetBase m_missingsubstitute; //Sustitute for bad decodes
-        private Dictionary<UUID,J2KImage> m_imagestore; // Our main image storage dictionary
-        private SortedList<double,UUID> m_priorities; // For fast image lookup based on priority
-        private Dictionary<int, int> m_priorityresolver; //Enabling super fast assignment of images with the same priorities
-
-        private const double doubleMinimum = .0000001;
-
-        public int m_outstandingtextures = 0;
-        //Constructor
         public LLImageManager(LLClientView client, IAssetService pAssetCache, IJ2KDecoder pJ2kDecodeModule)
         {
-            
-            m_imagestore = new Dictionary<UUID,J2KImage>();
-            m_priorities = new SortedList<double,UUID>();
-            m_priorityresolver = new Dictionary<int, int>();
             m_client = client;
             m_assetCache = pAssetCache;
             if (pAssetCache != null)
-                m_missingsubstitute = pAssetCache.Get("5748decc-f629-461c-9a36-a35a221fe21f");
+                m_missingImage = pAssetCache.Get("5748decc-f629-461c-9a36-a35a221fe21f");
             else
-                m_log.Error("[ClientView] - couldn't set missing image, all manner of things will probably break");
+                m_log.Error("[ClientView] - couldn't set missing image asset, falling back to missing image packet. This is known to crash the client");
+
             m_j2kDecodeModule = pJ2kDecodeModule;
         }
 
+        public LLClientView Client
+        {
+            get { return m_client; }
+        }
+
+        public AssetBase MissingImage
+        {
+            get { return m_missingImage; }
+        }
+
         public void EnqueueReq(TextureRequestArgs newRequest)
         {
             //newRequest is the properties of our new texture fetch request.
@@ -88,234 +90,203 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             //Make sure we're not shutting down..
             if (!m_shuttingdown)
             {
+                J2KImage imgrequest;
 
-                //Do we already know about this UUID?
-                if (m_imagestore.ContainsKey(newRequest.RequestedAssetID))
-                {
-                    //Check the packet sequence to make sure this isn't older than 
-                    //one we've already received
-
-                    J2KImage imgrequest = m_imagestore[newRequest.RequestedAssetID];
-
-                    // This is the inbound request sequence number. We can ignore
-                    // "old" ones.
+                // Do a linear search for this texture download
+                lock (m_priorityQueue)
+                    m_priorityQueue.Find(delegate(J2KImage img) { return img.m_requestedUUID == newRequest.RequestedAssetID; }, out imgrequest);
 
-                    if (newRequest.requestSequence > imgrequest.m_lastSequence)
+                if (imgrequest != null)
+                {
+                    if (newRequest.DiscardLevel == -1 && newRequest.Priority == 0f)
                     {
+                        //m_log.Debug("[TEX]: (CAN) ID=" + newRequest.RequestedAssetID);
 
-                        imgrequest.m_lastSequence = newRequest.requestSequence;
-
-                        //Check the priority
-
-                        double priority = imgrequest.m_requestedPriority;
-                        if (priority != newRequest.Priority)
+                        try 
                         {
-                            //Remove the old priority
-                            m_priorities.Remove(imgrequest.m_designatedPriorityKey);
-                            //Assign a new unique priority
-                            imgrequest.m_requestedPriority = newRequest.Priority;
-                            imgrequest.m_designatedPriorityKey = AssignPriority(newRequest.RequestedAssetID, newRequest.Priority);
+                            lock (m_priorityQueue)
+                                m_priorityQueue.Delete(imgrequest.m_priorityQueueHandle); 
                         }
+                        catch (Exception) { }
+                    }
+                    else
+                    {
+                        //m_log.DebugFormat("[TEX]: (UPD) ID={0}: D={1}, S={2}, P={3}",
+                        //    newRequest.RequestedAssetID, newRequest.DiscardLevel, newRequest.PacketNumber, newRequest.Priority);
 
-                        //Update the requested discard level
-                        imgrequest.m_requestedDiscardLevel = newRequest.DiscardLevel;
+                        //Check the packet sequence to make sure this isn't older than 
+                        //one we've already received
+                        if (newRequest.requestSequence > imgrequest.m_lastSequence)
+                        {
+                            //Update the sequence number of the last RequestImage packet
+                            imgrequest.m_lastSequence = newRequest.requestSequence;
 
-                        //Update the requested packet number
-                        imgrequest.m_requestedPacketNumber = newRequest.PacketNumber;
+                            //Update the requested discard level
+                            imgrequest.m_requestedDiscardLevel = newRequest.DiscardLevel;
 
-                        //Check if this will create an outstanding texture request
-                        bool activated = imgrequest.m_completedSendAtCurrentDiscardLevel;
-                        //Run an update
+                            //Update the requested packet number
+                            imgrequest.m_requestedPacketNumber = newRequest.PacketNumber;
 
-                        imgrequest.RunUpdate();
+                            //Update the requested priority
+                            imgrequest.m_requestedPriority = newRequest.Priority;
+                            try 
+                            { 
+                                lock (m_priorityQueue)
+                                    m_priorityQueue.Replace(imgrequest.m_priorityQueueHandle, imgrequest); 
+                            }
+                            catch (Exception) 
+                            { 
+                                imgrequest.m_priorityQueueHandle = null; 
+                                lock (m_priorityQueue)
+                                    m_priorityQueue.Add(ref imgrequest.m_priorityQueueHandle, imgrequest); 
+                            }
 
-                        if (activated && !imgrequest.m_completedSendAtCurrentDiscardLevel && imgrequest.m_decoded)
-                        {
-                            Interlocked.Increment(ref m_outstandingtextures);
+                            //Run an update
+                            imgrequest.RunUpdate();
                         }
                     }
                 }
                 else
                 {
-                    J2KImage imgrequest = new J2KImage(this);
-
-                    //Assign our missing substitute
-                    imgrequest.m_MissingSubstitute = m_missingsubstitute;
+                    if (newRequest.DiscardLevel == -1 && newRequest.Priority == 0f)
+                    {
+                        //m_log.DebugFormat("[TEX]: (IGN) ID={0}: D={1}, S={2}, P={3}",
+                        //    newRequest.RequestedAssetID, newRequest.DiscardLevel, newRequest.PacketNumber, newRequest.Priority);
+                    }
+                    else
+                    {
+                        //m_log.DebugFormat("[TEX]: (NEW) ID={0}: D={1}, S={2}, P={3}",
+                        //    newRequest.RequestedAssetID, newRequest.DiscardLevel, newRequest.PacketNumber, newRequest.Priority);
 
-                    //Assign our decoder module
-                    imgrequest.m_j2kDecodeModule = m_j2kDecodeModule;
+                        imgrequest = new J2KImage(this);
 
-                    //Assign our asset cache module
-                    imgrequest.m_assetCache = m_assetCache;
+                        //Assign our decoder module
+                        imgrequest.m_j2kDecodeModule = m_j2kDecodeModule;
 
-                    //Assign a priority based on our request
-                    imgrequest.m_designatedPriorityKey = AssignPriority(newRequest.RequestedAssetID, newRequest.Priority);
+                        //Assign our asset cache module
+                        imgrequest.m_assetCache = m_assetCache;
 
-                    //Assign the requested discard level
-                    imgrequest.m_requestedDiscardLevel = newRequest.DiscardLevel;
+                        //Assign the requested discard level
+                        imgrequest.m_requestedDiscardLevel = newRequest.DiscardLevel;
 
-                    //Assign the requested packet number
-                    imgrequest.m_requestedPacketNumber = newRequest.PacketNumber;
+                        //Assign the requested packet number
+                        imgrequest.m_requestedPacketNumber = newRequest.PacketNumber;
 
-                    //Assign the requested priority
-                    imgrequest.m_requestedPriority = newRequest.Priority;
+                        //Assign the requested priority
+                        imgrequest.m_requestedPriority = newRequest.Priority;
 
-                    //Assign the asset uuid
-                    imgrequest.m_requestedUUID = newRequest.RequestedAssetID;
+                        //Assign the asset uuid
+                        imgrequest.m_requestedUUID = newRequest.RequestedAssetID;
 
-                    m_imagestore.Add(imgrequest.m_requestedUUID, imgrequest);
+                        //Assign the requested priority
+                        imgrequest.m_requestedPriority = newRequest.Priority;
 
-                    //Run an update
-                    imgrequest.RunUpdate();
+                        //Add this download to the priority queue
+                        lock (m_priorityQueue)
+                            m_priorityQueue.Add(ref imgrequest.m_priorityQueueHandle, imgrequest);
 
+                        //Run an update
+                        imgrequest.RunUpdate();
+                    }
                 }
             }
         }
 
-        private double AssignPriority(UUID pAssetID, double pPriority)
+        public bool ProcessImageQueue(int count, int maxpack)
         {
-            
-            //First, find out if we can just assign directly
-            if (m_priorityresolver.ContainsKey((int)pPriority) == false)
+            lock (this)
             {
-                m_priorities.Add((double)((int)pPriority), pAssetID);
-                m_priorityresolver.Add((int)pPriority, 0);
-                return (double)((int)pPriority);
-            }
-            else
-            {
-                //Use the hash lookup goodness of a secondary dictionary to find a free slot
-                double mFreePriority = ((int)pPriority) + (doubleMinimum * (m_priorityresolver[(int)pPriority] + 1));
-                m_priorities[mFreePriority] = pAssetID;
-                m_priorityresolver[(int)pPriority]++;
-                return mFreePriority;
-            }
+                //count is the number of textures we want to process in one go.
+                //As part of this class re-write, that number will probably rise
+                //since we're processing in a more efficient manner.
 
+                // this can happen during Close()
+                if (m_client == null)
+                    return false;
 
+                int numCollected = 0;
 
-        }
+                //Calculate our threshold
+                int threshold;
+                if (m_lastloopprocessed == 0)
+                {
+                    if (m_client.PacketHandler == null || m_client.PacketHandler.PacketQueue == null || m_client.PacketHandler.PacketQueue.TextureThrottle == null)
+                        return false;
+                    //This is decent for a semi fast machine, but we'll calculate it more accurately based on time below
+                    threshold = m_client.PacketHandler.PacketQueue.TextureThrottle.Current / 6300;
+                    m_lastloopprocessed = DateTime.Now.Ticks;
+                }
+                else
+                {
+                    double throttleseconds = ((double)DateTime.Now.Ticks - (double)m_lastloopprocessed) / (double)TimeSpan.TicksPerSecond;
+                    throttleseconds = throttleseconds * m_client.PacketHandler.PacketQueue.TextureThrottle.Current;
 
-        public bool ProcessImageQueue(int count, int maxpack)
-        {
+                    //Average of 1000 bytes per packet
+                    throttleseconds = throttleseconds / 1000;
+
+                    //Safe-zone multiplier of 2.0
+                    threshold = (int)(throttleseconds * 2.0);
+                    m_lastloopprocessed = DateTime.Now.Ticks;
+
+                }
+
+                if (m_client.PacketHandler == null)
+                    return false;
 
-            // this can happen during Close()
-            if (m_client == null)
-                return false;
-            
-            //Count is the number of textures we want to process in one go.
-            //As part of this class re-write, that number will probably rise
-            //since we're processing in a more efficient manner.
-            
-            int numCollected = 0;
-
-             //Calculate our threshold
-             int threshold;
-             if (m_lastloopprocessed == 0)
-             {
-                  if (m_client.PacketHandler == null || m_client.PacketHandler.PacketQueue == null || m_client.PacketHandler.PacketQueue.TextureThrottle == null)
-                      return false;
-                 //This is decent for a semi fast machine, but we'll calculate it more accurately based on time below
-                  threshold = m_client.PacketHandler.PacketQueue.TextureThrottle.Current / 6300;
-                  m_lastloopprocessed = DateTime.Now.Ticks;
-             }
-             else
-             {
-                 double throttleseconds = ((double)DateTime.Now.Ticks - (double)m_lastloopprocessed) / (double)TimeSpan.TicksPerSecond;
-                 throttleseconds = throttleseconds * m_client.PacketHandler.PacketQueue.TextureThrottle.Current;
- 
-                 //Average of 1000 bytes per packet
-                 throttleseconds = throttleseconds / 1000;
- 
-                 //Safe-zone multiplier of 2.0
-                 threshold = (int)(throttleseconds * 2.0);
-                 m_lastloopprocessed = DateTime.Now.Ticks;
- 
-             }
-             
-             if (threshold < 10)
-             {
-                 threshold = 10;
-             }
-
-             if (m_client.PacketHandler == null)
-                 return false;
-
-             if (m_client.PacketHandler.PacketQueue == null)
-                 return false;
-
-            //First of all make sure our packet queue isn't above our threshold 
-
-            //Uncomment this to see what the texture stack is doing
-             //m_log.Debug("Queue: " + m_client.PacketHandler.PacketQueue.TextureOutgoingPacketQueueCount.ToString() + " Threshold: " + threshold.ToString() + " outstanding: " + m_outstandingtextures.ToString());
-             if (m_client.PacketHandler.PacketQueue.TextureOutgoingPacketQueueCount < threshold && m_outstandingtextures > 0)
-             {
-                bool justreset = false;
-            
-                for (int x = m_priorities.Count - 1; x > -1; x--)
+                if (m_client.PacketHandler.PacketQueue == null)
+                    return false;
+
+                if (threshold < 10)
+                    threshold = 10;
+
+                //Uncomment this to see what the texture stack is doing
+                //m_log.Debug("Queue: " + m_client.PacketHandler.PacketQueue.getQueueCount(ThrottleOutPacketType.Texture).ToString() + " Threshold: " + threshold.ToString() + " outstanding: " + m_outstandingtextures.ToString());
+                if (true) //m_client.PacketHandler.PacketQueue.GetQueueCount(ThrottleOutPacketType.Texture) < threshold)
                 {
-                    
-                    J2KImage imagereq = m_imagestore[m_priorities.Values[x]];
-                    if (imagereq.m_decoded == true && !imagereq.m_completedSendAtCurrentDiscardLevel)
+                    while (m_priorityQueue.Count > 0)
                     {
-                        numCollected++;
-                        //SendPackets will send up to ten packets per cycle
-                        if (imagereq.SendPackets(m_client, maxpack))
+                        J2KImage imagereq = null;
+                        lock (m_priorityQueue)
+                            imagereq = m_priorityQueue.FindMax();
+
+                        if (imagereq.m_decoded == true)
                         {
-                            //Send complete
-                            if (!imagereq.m_completedSendAtCurrentDiscardLevel)
+                            // we need to test this here now that we are dropping assets
+                            if (!imagereq.m_hasasset)
                             {
-                                imagereq.m_completedSendAtCurrentDiscardLevel = true;
-                                Interlocked.Decrement(ref m_outstandingtextures);
-                                //Re-assign priority to bottom
-                                //Remove the old priority
-                                m_priorities.Remove(imagereq.m_designatedPriorityKey);
-                                int lowest;
-                                if (m_priorities.Count > 0)
-                                {
-                                    lowest = (int)m_priorities.Keys[0];
-                                    lowest--;
-                                }
-                                else
-                                {
-                                    lowest = -10000;
-                                }
-                                m_priorities.Add((double)lowest, imagereq.m_requestedUUID);
-                                imagereq.m_designatedPriorityKey = (double)lowest;
-                                if (m_priorityresolver.ContainsKey((int)lowest))
-                                {
-                                    m_priorityresolver[(int)lowest]++;
-                                }
-                                else
-                                {
-                                    m_priorityresolver.Add((int)lowest, 0);
+                                m_log.WarnFormat("[LLIMAGE MANAGER]: Re-requesting the image asset {0}", imagereq.m_requestedUUID);
+                                imagereq.RunUpdate();
+                                continue;
+                            }
+
+                            ++numCollected;
+
+                            //SendPackets will send up to ten packets per cycle
+                            if (imagereq.SendPackets(m_client, maxpack))
+                            {
+                                // Send complete. Destroy any knowledge of this transfer
+                                try 
+                                { 
+                                    lock (m_priorityQueue)
+                                        m_priorityQueue.Delete(imagereq.m_priorityQueueHandle); 
                                 }
+                                catch (Exception) { }
                             }
                         }
+
                         if (numCollected == count)
-                        {
                             break;
-                        }
-                    }
-                    if (numCollected == count || m_outstandingtextures == 0)
-                        break;
-                    if (numCollected % m_outstandingtextures == 0 && !justreset)
-                    {
-                        //We've gotten as much as we can from the stack,
-                        //reset to the top so that we can send MOAR DATA (nomnomnom)!
-                        x = m_priorities.Count - 1;
-
-                        justreset = true; //prevents us from getting stuck in a loop
                     }
                 }
-            }
 
-            return m_outstandingtextures != 0;
+                return m_priorityQueue.Count > 0;
+            }
         }
 
         //Faux destructor
         public void Close()
         {
-            
+
             m_shuttingdown = true;
             m_j2kDecodeModule = null;
             m_assetCache = null;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index eaf8f60..e98a360 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -129,6 +129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         //
         public event PacketStats OnPacketStats;
         public event PacketDrop OnPacketDrop;
+        public event QueueEmpty OnQueueEmpty;
 
         
         //private SynchronizeClientHandler m_SynchronizeClient = null;
@@ -172,13 +173,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             m_PacketQueue = new LLPacketQueue(client.AgentId, userSettings);
 
+            m_PacketQueue.OnQueueEmpty += TriggerOnQueueEmpty;
+
             m_AckTimer.Elapsed += AckTimerElapsed;
             m_AckTimer.Start();
         }
 
-        public void Stop()
+        public void Dispose()
         {
             m_AckTimer.Stop();
+            m_AckTimer.Close();
 
             m_PacketQueue.Enqueue(null);
             m_PacketQueue.Close();
@@ -768,6 +772,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handlerPacketDrop(packet, id);
         }
 
+        private void TriggerOnQueueEmpty(ThrottleOutPacketType queue)
+        {
+            QueueEmpty handlerQueueEmpty = OnQueueEmpty;
+
+            if (handlerQueueEmpty != null)
+                handlerQueueEmpty(queue);
+        }
+
         // Convert the packet to bytes and stuff it onto the send queue
         //
         public void ProcessOutPacket(LLQueItem item)
@@ -849,5 +861,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_PacketQueue.Close();
             Thread.CurrentThread.Abort();
         }
+
+        public int GetQueueCount(ThrottleOutPacketType queue)
+        {
+            return m_PacketQueue.GetQueueCount(queue);
+        }
     }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index c427870..3eed2e0 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -39,7 +39,7 @@ using Timer=System.Timers.Timer;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
-    public class LLPacketQueue : IPullStatsProvider
+    public class LLPacketQueue : IPullStatsProvider, IDisposable
     {
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -62,6 +62,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private Queue<LLQueItem> TextureOutgoingPacketQueue;
         private Queue<LLQueItem> AssetOutgoingPacketQueue;
 
+        private List<ThrottleOutPacketType> Empty = new List<ThrottleOutPacketType>();
+                // m_log.Info("[THROTTLE]: Entering Throttle");
         // private Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();
         // private Dictionary<uint, Packet> NeedAck = new Dictionary<uint, Packet>();
 
@@ -85,26 +87,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         
         private Dictionary<uint,int> contents = new Dictionary<uint, int>();
 
-        /// <summary>
-        /// The number of packets in the OutgoingPacketQueue
-        /// 
-        /// </summary>
-        internal int TextureOutgoingPacketQueueCount
-        {
-            get 
-            { 
-                if (TextureOutgoingPacketQueue == null)
-                    return 0;
-                return TextureOutgoingPacketQueue.Count;
-            }
-        }
-
         // private long LastThrottle;
         // private long ThrottleInterval;
         private Timer throttleTimer;
 
         private UUID m_agentId;
 
+        public event QueueEmpty OnQueueEmpty;
+
         public LLPacketQueue(UUID agentId, ClientStackUserSettings userSettings)
         {
             // While working on this, the BlockingQueue had me fooled for a bit.
@@ -210,28 +200,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 switch (item.throttleType & ThrottleOutPacketType.TypeMask)
                 {
                     case ThrottleOutPacketType.Resend:
-                        ThrottleCheck(ref ResendThrottle, ref ResendOutgoingPacketQueue, item);
+                        ThrottleCheck(ref ResendThrottle, ref ResendOutgoingPacketQueue, item, ThrottleOutPacketType.Resend);
                         break;
                     case ThrottleOutPacketType.Texture:
-                        ThrottleCheck(ref TextureThrottle, ref TextureOutgoingPacketQueue, item);
+                        ThrottleCheck(ref TextureThrottle, ref TextureOutgoingPacketQueue, item, ThrottleOutPacketType.Texture);
                         break;
                     case ThrottleOutPacketType.Task:
                         if ((item.throttleType & ThrottleOutPacketType.LowPriority) != 0)
-                            ThrottleCheck(ref TaskThrottle, ref TaskLowpriorityPacketQueue, item);
+                            ThrottleCheck(ref TaskThrottle, ref TaskLowpriorityPacketQueue, item, ThrottleOutPacketType.Task);
                         else
-                            ThrottleCheck(ref TaskThrottle, ref TaskOutgoingPacketQueue, item);
+                            ThrottleCheck(ref TaskThrottle, ref TaskOutgoingPacketQueue, item, ThrottleOutPacketType.Task);
                         break;
                     case ThrottleOutPacketType.Land:
-                        ThrottleCheck(ref LandThrottle, ref LandOutgoingPacketQueue, item);
+                        ThrottleCheck(ref LandThrottle, ref LandOutgoingPacketQueue, item, ThrottleOutPacketType.Land);
                         break;
                     case ThrottleOutPacketType.Asset:
-                        ThrottleCheck(ref AssetThrottle, ref AssetOutgoingPacketQueue, item);
+                        ThrottleCheck(ref AssetThrottle, ref AssetOutgoingPacketQueue, item, ThrottleOutPacketType.Asset);
                         break;
                     case ThrottleOutPacketType.Cloud:
-                        ThrottleCheck(ref CloudThrottle, ref CloudOutgoingPacketQueue, item);
+                        ThrottleCheck(ref CloudThrottle, ref CloudOutgoingPacketQueue, item, ThrottleOutPacketType.Cloud);
                         break;
                     case ThrottleOutPacketType.Wind:
-                        ThrottleCheck(ref WindThrottle, ref WindOutgoingPacketQueue, item);
+                        ThrottleCheck(ref WindThrottle, ref WindOutgoingPacketQueue, item, ThrottleOutPacketType.Wind);
                         break;
 
                     default:
@@ -283,43 +273,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             lock (this)
             {
-                while (PacketsWaiting())
+                // These categories do not contain transactional packets so we can safely drop any pending data in them
+                LandOutgoingPacketQueue.Clear();
+                WindOutgoingPacketQueue.Clear();
+                CloudOutgoingPacketQueue.Clear();
+                TextureOutgoingPacketQueue.Clear();
+                AssetOutgoingPacketQueue.Clear();
+
+                // Now comes the fun part..   we dump all remaining resend and task packets into the send queue
+                while (ResendOutgoingPacketQueue.Count > 0 || TaskOutgoingPacketQueue.Count > 0 || TaskLowpriorityPacketQueue.Count > 0)
                 {
-                    //Now comes the fun part..   we dump all our elements into m_packetQueue that we've saved up.
                     if (ResendOutgoingPacketQueue.Count > 0)
-                    {
                         SendQueue.Enqueue(ResendOutgoingPacketQueue.Dequeue());
-                    }
-                    if (LandOutgoingPacketQueue.Count > 0)
-                    {
-                        SendQueue.Enqueue(LandOutgoingPacketQueue.Dequeue());
-                    }
-                    if (WindOutgoingPacketQueue.Count > 0)
-                    {
-                        SendQueue.Enqueue(WindOutgoingPacketQueue.Dequeue());
-                    }
-                    if (CloudOutgoingPacketQueue.Count > 0)
-                    {
-                        SendQueue.Enqueue(CloudOutgoingPacketQueue.Dequeue());
-                    }
+
                     if (TaskOutgoingPacketQueue.Count > 0)
-                    {
                         SendQueue.PriorityEnqueue(TaskOutgoingPacketQueue.Dequeue());
-                    }
+
                     if (TaskLowpriorityPacketQueue.Count > 0)
-                    {
                         SendQueue.Enqueue(TaskLowpriorityPacketQueue.Dequeue());
-                    }
-                    if (TextureOutgoingPacketQueue.Count > 0)
-                    {
-                        SendQueue.Enqueue(TextureOutgoingPacketQueue.Dequeue());
-                    }
-                    if (AssetOutgoingPacketQueue.Count > 0)
-                    {
-                        SendQueue.Enqueue(AssetOutgoingPacketQueue.Dequeue());
-                    }
                 }
-                // m_log.Info("[THROTTLE]: Processed " + throttleLoops + " packets");
             }
         }
 
@@ -342,11 +314,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void Close()
         {
+            Dispose();
+        }
+
+        public void Dispose()
+        {
             Flush();
             WipeClean(); // I'm sure there's a dirty joke in here somewhere. -AFrisby
 
             m_enabled = false;
             throttleTimer.Stop();
+            throttleTimer.Close();
 
             if (StatsManager.SimExtraStats != null)
             {
@@ -388,6 +366,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             int MaxThrottleLoops = 4550; // 50*7 packets can be dequeued at once.
             int throttleLoops = 0;
+            List<ThrottleOutPacketType> e;
 
             // We're going to dequeue all of the saved up packets until
             // we've hit the throttle limit or there's no more packets to send
@@ -399,7 +378,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 bool qchanged = true;
                 
                 ResetCounters();
-                // m_log.Info("[THROTTLE]: Entering Throttle");
+
                 while (TotalThrottle.UnderLimit() && qchanged && throttleLoops <= MaxThrottleLoops)
                 {
                     qchanged = false; // We will break out of the loop if no work was accomplished
@@ -425,6 +404,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         TotalThrottle.AddBytes(qpack.Length);
                         LandThrottle.AddBytes(qpack.Length);
                         qchanged = true;
+
+                        if (LandOutgoingPacketQueue.Count == 0 && !Empty.Contains(ThrottleOutPacketType.Land))
+                            Empty.Add(ThrottleOutPacketType.Land);
                     }
                     
                     if ((WindOutgoingPacketQueue.Count > 0) && WindThrottle.UnderLimit())
@@ -435,6 +417,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         TotalThrottle.AddBytes(qpack.Length);
                         WindThrottle.AddBytes(qpack.Length);
                         qchanged = true;
+
+                        if (WindOutgoingPacketQueue.Count == 0 && !Empty.Contains(ThrottleOutPacketType.Wind))
+                            Empty.Add(ThrottleOutPacketType.Wind);
                     }
                     
                     if ((CloudOutgoingPacketQueue.Count > 0) && CloudThrottle.UnderLimit())
@@ -445,6 +430,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         TotalThrottle.AddBytes(qpack.Length);
                         CloudThrottle.AddBytes(qpack.Length);
                         qchanged = true;
+
+                        if (CloudOutgoingPacketQueue.Count == 0 && !Empty.Contains(ThrottleOutPacketType.Cloud))
+                            Empty.Add(ThrottleOutPacketType.Cloud);
                     }
                     
                     if ((TaskOutgoingPacketQueue.Count > 0 || TaskLowpriorityPacketQueue.Count > 0) && TaskThrottle.UnderLimit())
@@ -464,6 +452,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         TotalThrottle.AddBytes(qpack.Length);
                         TaskThrottle.AddBytes(qpack.Length);
                         qchanged = true;
+
+                        if (TaskOutgoingPacketQueue.Count == 0 && TaskLowpriorityPacketQueue.Count == 0 && !Empty.Contains(ThrottleOutPacketType.Task))
+                            Empty.Add(ThrottleOutPacketType.Task);
                     }
                     
                     if ((TextureOutgoingPacketQueue.Count > 0) && TextureThrottle.UnderLimit())
@@ -474,6 +465,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         TotalThrottle.AddBytes(qpack.Length);
                         TextureThrottle.AddBytes(qpack.Length);
                         qchanged = true;
+
+                        if (TextureOutgoingPacketQueue.Count == 0 && !Empty.Contains(ThrottleOutPacketType.Texture))
+                            Empty.Add(ThrottleOutPacketType.Texture);
                     }
                     
                     if ((AssetOutgoingPacketQueue.Count > 0) && AssetThrottle.UnderLimit())
@@ -484,10 +478,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         TotalThrottle.AddBytes(qpack.Length);
                         AssetThrottle.AddBytes(qpack.Length);
                         qchanged = true;
+
+                        if (AssetOutgoingPacketQueue.Count == 0 && !Empty.Contains(ThrottleOutPacketType.Asset))
+                            Empty.Add(ThrottleOutPacketType.Asset);
                     }
                 }
                 // m_log.Info("[THROTTLE]: Processed " + throttleLoops + " packets");
+
+                e = new List<ThrottleOutPacketType>(Empty);
+                Empty.Clear();
             }
+
+            foreach (ThrottleOutPacketType t in e)
+            {
+                if (GetQueueCount(t) == 0)
+                    TriggerOnQueueEmpty(t);
+            }
+        }
+
+        private void TriggerOnQueueEmpty(ThrottleOutPacketType queue)
+        {
+            QueueEmpty handlerQueueEmpty = OnQueueEmpty;
+
+            if (handlerQueueEmpty != null)
+                handlerQueueEmpty(queue);
         }
 
         private void ThrottleTimerElapsed(object sender, ElapsedEventArgs e)
@@ -497,7 +511,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             ProcessThrottle();
         }
 
-        private void ThrottleCheck(ref LLPacketThrottle throttle, ref Queue<LLQueItem> q, LLQueItem item)
+        private void ThrottleCheck(ref LLPacketThrottle throttle, ref Queue<LLQueItem> q, LLQueItem item, ThrottleOutPacketType itemType)
         {
             // The idea..  is if the packet throttle queues are empty
             // and the client is under throttle for the type.  Queue
@@ -513,6 +527,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     throttle.AddBytes(item.Length);
                     TotalThrottle.AddBytes(item.Length);
                     SendQueue.Enqueue(item);
+                    lock (this)
+                    {
+                        if (!Empty.Contains(itemType))
+                            Empty.Add(itemType);
+                    }
                 }
                 catch (Exception e)
                 {
@@ -698,5 +717,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             get { return throttleMultiplier; }
         }
+
+        public int GetQueueCount(ThrottleOutPacketType queue)
+        {
+            switch (queue)
+            {
+            case ThrottleOutPacketType.Land:
+                return LandOutgoingPacketQueue.Count;
+            case ThrottleOutPacketType.Wind:
+                return WindOutgoingPacketQueue.Count;
+            case ThrottleOutPacketType.Cloud:
+                return CloudOutgoingPacketQueue.Count;
+            case ThrottleOutPacketType.Task:
+                return TaskOutgoingPacketQueue.Count;
+            case ThrottleOutPacketType.Texture:
+                return TextureOutgoingPacketQueue.Count;
+            case ThrottleOutPacketType.Asset:
+                return AssetOutgoingPacketQueue.Count;
+            }
+
+            return 0;
+        }
     }
 }