Prevent a null ref

2010-05-27 20:08:48 +02:00 · 2010-05-27 20:08:48 +02:00 · 8fb706716b
parent ecc77e3886
commit 8fb706716b
1 changed files with 3 additions and 0 deletions
--- 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