Guard against locking a nullref to avoid build break

2010-10-08 19:19:07 +01:00 · 2010-10-08 19:19:07 +01:00 · 4a0911bdbd
parent 5dcbbb726a
commit 4a0911bdbd
1 changed files with 3 additions and 0 deletions
--- 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)