From d54b6608a7acfa7fc9fd074f2fbd241519067fcb Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 17 Nov 2008 15:40:27 +0000
Subject: * Stop nulling SOG.m_rootPart and parts on object deletion * This
 renders RootPart == null checks useless - the replacement is to check
 SOG.IsDeleted.  However, in many cases this will not be necessary since
 updates to deleted parts will not be sent to the client * This should remove
 any remaining race conditions where an object is deleted while another thread
 is yet to obtain the root part to perform some operation * Doing this is
 probably a necessary prerequisite to moving to a model without a separate SOG
 and SOP * Unfortunately it's not possible to eliminate all RootPart == null
 checks since in some contexts it is currently used to check whether an object
 was created successfully

---
 OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs')

diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
index 706ba6a..442b40d 100644
--- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Region.Environment.Scenes
                             "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left);
                         
                         x = m_inventoryDeletes.Dequeue();
-                        if (x.objectGroup.RootPart != null)
+                        if (!x.objectGroup.IsDeleted)
                         {
                             try
                             {
-- 
cgit v1.1