From 5dcbbb726a15bc14da76b59577d009c25ad5e4e1 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 8 Oct 2010 18:40:13 +0100
Subject: Change the order of actions to address a possible nullref

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

(limited to 'OpenSim/Region/Framework')

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