From 9e4d077d70f2fce2c03e81ab01c2b6369734bd69 Mon Sep 17 00:00:00 2001
From: MW <Michaelwri22@yahoo.co.uk>
Date: Fri, 26 Jun 2009 12:30:54 +0000
Subject: [PATCH] Fixed null bug, which was making unit tests fail

---
 OpenSim/Region/Framework/Scenes/SceneViewer.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 4e542b89ac..42966b1ebe 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;
+                }
             }
         }