* Fixed a bug where clients were being added to ClientManager twice

* Changed the ClientManager interface to reduce potential errors with duplicate or mismatched keys
* Added IClientAPI.RemoteEndPoint, which can (hopefully) eventually replace IClientAPI.CircuitCode
* Changed the order of operations during client shutdown

1 files changed, 22 insertions, 22 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 343f537..8469ba6 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -167,39 +167,39 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             J2KImage imagereq;
             int numCollected = 0;
 
-            //lock (m_syncRoot)
-            //{
-                m_lastloopprocessed = DateTime.Now.Ticks;
-
-                // This can happen during Close()
-                if (m_client == null)
-                    return false;
-                
-                while ((imagereq = GetHighestPriorityImage()) != null)
+            m_lastloopprocessed = DateTime.Now.Ticks;
+
+            // This can happen during Close()
+            if (m_client == null)
+                return false;
+
+            while ((imagereq = GetHighestPriorityImage()) != null)
+            {
+                if (imagereq.IsDecoded == true)
                 {
-                    if (imagereq.IsDecoded == true)
-                    {
-                        ++numCollected;
+                    ++numCollected;
 
-                        if (imagereq.SendPackets(m_client, maxpack))
-                        {
-                            // Send complete. Destroy any knowledge of this transfer
-                            RemoveImageFromQueue(imagereq);
-                        }
+                    if (imagereq.SendPackets(m_client, maxpack))
+                    {
+                        // Send complete. Destroy any knowledge of this transfer
+                        RemoveImageFromQueue(imagereq);
                     }
-
-                    if (numCollected == count)
-                        break;
                 }
-            //}
+
+                if (numCollected == count)
+                    break;
+            }
 
             return m_priorityQueue.Count > 0;
         }
 
-        //Faux destructor
+        /// <summary>
+        /// Faux destructor
+        /// </summary>
         public void Close()
         {
             m_shuttingdown = true;
+            m_priorityQueue = null;
             m_j2kDecodeModule = null;
             m_assetCache = null;
             m_client = null;