From 7c04d278753c717a91e5eeb3086d62c771b03f05 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sat, 1 Nov 2008 21:50:07 +0000
Subject: * Introduce an IsAttachment property on the group level (which just
 returns false if the group is already deleted) * This is to avoid repetitive
 null checks - I'm beginning to think that blasting away the root part on
 object deletion is actually a bad move.  Perhaps we should leave it around
 and let the client ignore any superfluous packets (which it may well do
 anyway), since we're constantly exposing a race condition

---
 .../Modules/World/Archiver/ArchiveWriteRequestPreparation.cs            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Modules/World')

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 8c623b1..b520642 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -276,7 +276,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 {
                     SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
                     
-                    if (sceneObject.RootPart != null && !sceneObject.RootPart.IsAttachment)
+                    if (!sceneObject.IsDeleted && !sceneObject.IsAttachment)
                         sceneObjects.Add((SceneObjectGroup)entity);
                 }
             }
-- 
cgit v1.1