aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 4575068..989ec37 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
1700 // Invalid id 1700 // Invalid id
1701 SceneObjectPart part = GetSceneObjectPart(localID); 1701 SceneObjectPart part = GetSceneObjectPart(localID);
1702 if (part == null) 1702 if (part == null)
1703 {
1704 //Client still thinks the object exists, kill it
1705 SendKillObject(localID);
1703 continue; 1706 continue;
1707 }
1704 1708
1705 // Already deleted by someone else 1709 // Already deleted by someone else
1706 if (part.ParentGroup == null || part.ParentGroup.IsDeleted) 1710 if (part.ParentGroup == null || part.ParentGroup.IsDeleted)
1711 {
1712 //Client still thinks the object exists, kill it
1713 SendKillObject(localID);
1707 continue; 1714 continue;
1715 }
1708 1716
1709 // Can't delete child prims 1717 // Can't delete child prims
1710 if (part != part.ParentGroup.RootPart) 1718 if (part != part.ParentGroup.RootPart)