aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-01-29 16:50:00 +0000
committerMelanie2010-01-29 16:50:00 +0000
commit0c5850237ec68158743117933d2ddd6e7df62c28 (patch)
tree33903f5cc647b0c4d8b8d81bcea8d687e4012fc5 /OpenSim/Region/Framework/Scenes
parentPrevent empty ObjectProperties packets being sent (diff)
downloadopensim-SC-0c5850237ec68158743117933d2ddd6e7df62c28.zip
opensim-SC-0c5850237ec68158743117933d2ddd6e7df62c28.tar.gz
opensim-SC-0c5850237ec68158743117933d2ddd6e7df62c28.tar.bz2
opensim-SC-0c5850237ec68158743117933d2ddd6e7df62c28.tar.xz
Small fix for a spurious exception
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index e4296ef..1cff0eb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Framework.Scenes
76 76
77 foreach (EntityBase e in m_presence.Scene.Entities) 77 foreach (EntityBase e in m_presence.Scene.Entities)
78 { 78 {
79 if (e is SceneObjectGroup) 79 if (e != null && e is SceneObjectGroup)
80 m_pendingObjects.Enqueue((SceneObjectGroup)e); 80 m_pendingObjects.Enqueue((SceneObjectGroup)e);
81 } 81 }
82 } 82 }