From fd9ba29a03150297c99653d25e4d6c015a0fe7d9 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Tue, 10 Mar 2009 15:54:00 +0000
Subject: From: Alan M Webb <alan_webb@us.ibm.com>

  Fix a null reference loophole in ScenePresence.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5831ff4..3ef3f6c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -718,7 +718,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            while (m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < 60)
+            while (m_pendingObjects != null && m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < 60)
             {
                 SceneObjectGroup g = m_pendingObjects.Dequeue();
 
-- 
cgit v1.1