From ba49319c077bc5e7b998674aaac62497e757706c Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 27 May 2010 20:08:48 +0200
Subject: Prevent a null ref

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

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 4ba4fab..2fc98e5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -84,6 +84,9 @@ namespace OpenSim.Region.Framework.Scenes
             while (m_pendingObjects != null && m_pendingObjects.Count > 0)
             {
                 SceneObjectGroup g = m_pendingObjects.Dequeue();
+                 // Yes, this can really happen
+                 if (g == null)
+                    continue;
 
                 // This is where we should check for draw distance
                 // do culling and stuff. Problem with that is that until
-- 
cgit v1.1