1 files changed, 5 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index b45291f..b44a010 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -179,11 +179,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void Reset()
         {
-            if (m_pendingObjects != null)
+            if (m_pendingObjects == null)
+                return;
+
+            lock (m_pendingObjects)
             {
-                lock (m_pendingObjects)
+                if (m_pendingObjects != null)
                 {
-
                     m_pendingObjects.Clear();
                     m_pendingObjects = null;
                 }