aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 9ad8382..cc8501d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1552,7 +1552,7 @@ namespace OpenSim.Region.Environment.Scenes
1552 if (part == null) 1552 if (part == null)
1553 return; 1553 return;
1554 1554
1555 if (part.ParentGroup == null || part.ParentGroup.RootPart == null) 1555 if (part.ParentGroup == null || part.ParentGroup.IsDeleted)
1556 return; 1556 return;
1557 1557
1558 // Can't delete child prims 1558 // Can't delete child prims
@@ -2379,7 +2379,7 @@ namespace OpenSim.Region.Environment.Scenes
2379 public UUID RezSingleAttachment(SceneObjectGroup att, 2379 public UUID RezSingleAttachment(SceneObjectGroup att,
2380 IClientAPI remoteClient, UUID itemID, uint AttachmentPt) 2380 IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
2381 { 2381 {
2382 if (att.RootPart != null) 2382 if (!att.IsDeleted)
2383 AttachmentPt = att.RootPart.AttachmentPoint; 2383 AttachmentPt = att.RootPart.AttachmentPoint;
2384 2384
2385 ScenePresence presence; 2385 ScenePresence presence;