diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index e4296ef66c..1cff0ebe8e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs @@ -76,7 +76,7 @@ namespace OpenSim.Region.Framework.Scenes foreach (EntityBase e in m_presence.Scene.Entities) { - if (e is SceneObjectGroup) + if (e != null && e is SceneObjectGroup) m_pendingObjects.Enqueue((SceneObjectGroup)e); } }