Fixed null bug, which was making unit tests fail

1 files changed, 7 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 4e542b8..42966b1 100644
--- 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;

+                }

             }

         }