diff options
author | James J Greensky | 2009-09-30 17:30:28 -0700 |
---|---|---|
committer | Melanie | 2009-10-01 04:11:32 +0100 |
commit | 44776fea723774f0674881d69855af9657398d18 (patch) | |
tree | 272546e38e5a21bcddaf5446c9a7bc07878596b4 /OpenSim/Framework/BlockingQueue.cs | |
parent | Create j2k cache directory if it doesn't exist. The Meshmerizer needs it there. (diff) | |
download | opensim-SC-44776fea723774f0674881d69855af9657398d18.zip opensim-SC-44776fea723774f0674881d69855af9657398d18.tar.gz opensim-SC-44776fea723774f0674881d69855af9657398d18.tar.bz2 opensim-SC-44776fea723774f0674881d69855af9657398d18.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/BlockingQueue.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs index e03229b..857930a 100644 --- a/OpenSim/Framework/BlockingQueue.cs +++ b/OpenSim/Framework/BlockingQueue.cs | |||
@@ -66,7 +66,9 @@ namespace OpenSim.Framework | |||
66 | if (m_pqueue.Count > 0) | 66 | if (m_pqueue.Count > 0) |
67 | return m_pqueue.Dequeue(); | 67 | return m_pqueue.Dequeue(); |
68 | 68 | ||
69 | return m_queue.Dequeue(); | 69 | if (m_queue.Count > 0) |
70 | return m_queue.Dequeue(); | ||
71 | return default(T); | ||
70 | } | 72 | } |
71 | } | 73 | } |
72 | 74 | ||
@@ -119,6 +121,7 @@ namespace OpenSim.Framework | |||
119 | { | 121 | { |
120 | m_pqueue.Clear(); | 122 | m_pqueue.Clear(); |
121 | m_queue.Clear(); | 123 | m_queue.Clear(); |
124 | Monitor.Pulse(m_queueSync); | ||
122 | } | 125 | } |
123 | } | 126 | } |
124 | } | 127 | } |