From c088397ec72916dfb2914b44f2be8df827fd89d9 Mon Sep 17 00:00:00 2001 From: Tom Grimshaw Date: Sun, 18 Jul 2010 06:01:26 -0700 Subject: [PATCH] If the client requests that an object be deleted, and the SOG/SOP is null and/or is marked as deleted, just send the KillObject --- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 4575068edb..989ec37296 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -1700,11 +1700,19 @@ namespace OpenSim.Region.Framework.Scenes // Invalid id SceneObjectPart part = GetSceneObjectPart(localID); if (part == null) + { + //Client still thinks the object exists, kill it + SendKillObject(localID); continue; + } // Already deleted by someone else if (part.ParentGroup == null || part.ParentGroup.IsDeleted) + { + //Client still thinks the object exists, kill it + SendKillObject(localID); continue; + } // Can't delete child prims if (part != part.ParentGroup.RootPart)