* In the most basic situations, ClientView and ScenePresence no longer leak memory

* However, I'm no longer sure they were even a big contributory factor (to this particular leak, there are other causes of other leaks).  I need better measurement techniques
* Removed most of my debugging gawp

2 files changed, 10 insertions, 4 deletions

diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 7529111..4f877be 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -146,9 +146,12 @@ namespace OpenSim.Region.Environment.Modules
 
         public void ProcessTextureSenders()
         {
+            TextureSender sender = null;
+            
             while (true)
             {
-                TextureSender sender = m_queueSenders.Dequeue();
+                sender = m_queueSenders.Dequeue();
+                
                 if (sender.Cancel)
                 {
                     TextureSent(sender);
@@ -168,7 +171,10 @@ namespace OpenSim.Region.Environment.Modules
                     }
                 }
                 
-                m_log.Info(String.Format("[TEXTURE DOWNLOAD] Texture sender queue size: {0}", m_queueSenders.Count()));
+                // Make sure that any sender we currently have can get garbage collected
+                sender = null;
+                
+                //m_log.Info(String.Format("[TEXTURE DOWNLOAD] Texture sender queue size: {0}", m_queueSenders.Count()));
             }
         }
 
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
index 08b6979..999f4a2 100644
--- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
@@ -104,9 +104,9 @@ namespace OpenSim.Region.Environment.Modules
                         EnqueueTextureSender(textureSender);
                     }
                     
-                    m_log.Info(String.Format("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID));
+                    //m_log.Info(String.Format("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID));
                     m_textureSenders.Remove(textureID);                    
-                    m_log.Info(String.Format("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count));
+                    //m_log.Info(String.Format("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count));
                 }
                 else
                 {