From 4a0911bdbd3429d88b448bd324d8813cf6023e64 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 8 Oct 2010 19:19:07 +0100
Subject: Guard against locking a nullref to avoid build break

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

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index e6f7235..b44a010 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -179,6 +179,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void Reset()
         {
+            if (m_pendingObjects == null)
+                return;
+
             lock (m_pendingObjects)
             {
                 if (m_pendingObjects != null)
-- 
cgit v1.1