Comment out SceneViewer.Reset() and stop calling from Close() since this is useless work as a closed scene object is never reset.

Strictly speaking, we could also stop bothering to clear the m_updateTimes and m_partsUpdateQueue if we are sure that the whole SceneViewer is shortly to be garbage collected anyway, but we'll leave them around for now.

1 files changed, 17 insertions, 16 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 3e0d1db..9ad80b8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -193,37 +193,38 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public void Reset()
-        {
-            if (m_pendingObjects == null)
-                return;
-
-            lock (m_pendingObjects)
-            {
-                if (m_pendingObjects != null)
-                {
-                    m_pendingObjects.Clear();
-                    m_pendingObjects = null;
-                }
-            }
-        }
+//        public void Reset()
+//        {
+//            if (m_pendingObjects == null)
+//                return;
+//
+//            lock (m_pendingObjects)
+//            {
+//                if (m_pendingObjects != null)
+//                {
+//                    m_pendingObjects.Clear();
+//                    m_pendingObjects = null;
+//                }
+//            }
+//        }
 
         public void Close()
         {
             lock (m_pendingObjects)
             {
+                // We perform this under the m_pendingObjects lock in order to avoid a race condition with another
+                // thread on SendPrimUpdates()
                 IsEnabled = false;
 
                 lock (m_updateTimes)
                 {
                     m_updateTimes.Clear();
                 }
+
                 lock (m_partsUpdateQueue)
                 {
                     m_partsUpdateQueue.Clear();
                 }
-    
-                Reset();
             }
         }