Fixed null bug, which was making unit tests fail

2009-06-26 12:30:54 +00:00 · 2009-06-26 12:30:54 +00:00 · 9e4d077d70
parent 7a2c41dea0
commit 9e4d077d70
1 changed files with 7 additions and 3 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@ -189,10 +189,14 @@ namespace OpenSim.Region.Framework.Scenes

        public void Reset()
        {
-            lock (m_pendingObjects)
+            if (m_pendingObjects != null)
            {
-                m_pendingObjects.Clear();
-                m_pendingObjects = null;
+                lock (m_pendingObjects)
+                {
+
+                    m_pendingObjects.Clear();
+                    m_pendingObjects = null;
+                }
            }
        }