From bc92d72828925d8b3df72cf66b003ae73731a352 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sun, 25 May 2008 00:09:08 +0000
Subject: * Refactor: Collapses parts of different code paths in scene used
 when deleting and unlinking an object

---
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index f4e1ef4..3407d4e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1744,9 +1744,7 @@ namespace OpenSim.Region.Environment.Scenes
                 part.ClearUndoState();
             }
 
-            DetachFromBackup(objectGroup);
-
-            m_scene.DeleteEntity(objectGroup.UUID);
+            m_scene.UnlinkSceneObject(objectGroup.UUID);
 
             // TODO Deleting the parts may cause problems later on if they have already
             // made it into the update queue.  However, sending out updates for those parts is now
-- 
cgit v1.1