From 44776fea723774f0674881d69855af9657398d18 Mon Sep 17 00:00:00 2001
From: James J Greensky
Date: Wed, 30 Sep 2009 17:30:28 -0700
Subject: Fixing LLClientView memory leak

Fixing LLClientView memory leak by disposing of all timers utilized
in LLClientView as they contain references to the callback method.
This required the use of the Terminate and Close infrastructure that
was already in place but was not being utilized.
---
 .../Region/ClientStack/LindenUDP/LLClientView.cs   | 23 ++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 9788f40..460f94e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -633,6 +633,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // of the client thread regardless of where Close() is called.
                 KillEndDone();
             }
+			
+			Terminate();
         }
 
         /// <summary>
@@ -737,16 +739,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         }
 
-        public void Terminate()
+        private void Terminate()
         {
+			IsActive = false;
+			
+			m_clientPingTimer.Close();
+			m_avatarTerseUpdateTimer.Close();
+			m_primTerseUpdateTimer.Close();
+			m_primFullUpdateTimer.Close();
+			m_textureRequestTimer.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 +886,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)
                 {
-- 
cgit v1.1