From 1fcac7203d0e92f735d10c42681768521d712ea5 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Wed, 27 Oct 2010 20:47:27 +0100
Subject: [PATCH] Prevent nullrefs in scene object deletion. Mantis #5156

---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index f81c551768..24d73346ff 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -406,11 +406,14 @@ namespace OpenSim.Region.Framework.Scenes
         public bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked)
         {
             EntityBase entity;
-            if (!Entities.TryGetValue(uuid, out entity) && entity is SceneObjectGroup)
+            if (!Entities.TryGetValue(uuid, out entity) || (!(entity is SceneObjectGroup)))
                 return false;
 
             SceneObjectGroup grp = (SceneObjectGroup)entity;
 
+            if (entity == null)
+                return false;
+
             if (!resultOfObjectLinked)
             {
                 m_numPrim -= grp.PrimCount;