diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 8b5316a..6d7f984 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1709,7 +1709,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1709 | if (part == null) | 1709 | if (part == null) |
1710 | { | 1710 | { |
1711 | //Client still thinks the object exists, kill it | 1711 | //Client still thinks the object exists, kill it |
1712 | SendKillObject(localID); | 1712 | deleteIDs.Add(localID); |
1713 | continue; | 1713 | continue; |
1714 | } | 1714 | } |
1715 | 1715 | ||
@@ -1717,7 +1717,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1717 | if (part.ParentGroup == null || part.ParentGroup.IsDeleted) | 1717 | if (part.ParentGroup == null || part.ParentGroup.IsDeleted) |
1718 | { | 1718 | { |
1719 | //Client still thinks the object exists, kill it | 1719 | //Client still thinks the object exists, kill it |
1720 | SendKillObject(localID); | 1720 | deleteIDs.Add(localID); |
1721 | continue; | 1721 | continue; |
1722 | } | 1722 | } |
1723 | 1723 | ||
@@ -1727,8 +1727,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1727 | 1727 | ||
1728 | SceneObjectGroup grp = part.ParentGroup; | 1728 | SceneObjectGroup grp = part.ParentGroup; |
1729 | 1729 | ||
1730 | deleteIDs.Add(localID); | ||
1731 | deleteGroups.Add(grp); | 1730 | deleteGroups.Add(grp); |
1731 | deleteIDs.Add(grp.LocalId); | ||
1732 | 1732 | ||
1733 | if (remoteClient == null) | 1733 | if (remoteClient == null) |
1734 | { | 1734 | { |
@@ -1811,6 +1811,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1811 | } | 1811 | } |
1812 | } | 1812 | } |
1813 | 1813 | ||
1814 | SendKillObject(deleteIDs); | ||
1815 | |||
1814 | if (permissionToTake) | 1816 | if (permissionToTake) |
1815 | { | 1817 | { |
1816 | m_asyncSceneObjectDeleter.DeleteToInventory( | 1818 | m_asyncSceneObjectDeleter.DeleteToInventory( |