From 0ee69707ea8c0948b79aeba5dbe078fe28dc6482 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sat, 24 May 2008 23:11:07 +0000
Subject: * Refactor: Collapse some multiple remove object paths * Push some
 delete functionality into InnerScene to match what's already there for adding
 objects

---
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 816b01d..82e112f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1251,14 +1251,12 @@ namespace OpenSim.Region.Environment.Scenes
                         }
                     }
 
-
                     if (permissionToDelete)
                     {
-                        DeleteSceneObjectGroup(objectGroup);
+                        DeleteSceneObject(objectGroup);
                     }
                 }
-            }
-            
+            }           
         }
 
         public void updateKnownAsset(IClientAPI remoteClient, SceneObjectGroup grp, LLUUID assetID, LLUUID agentID)
@@ -1790,7 +1788,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                         returnobjects[i] = null;
 
-                        DeleteSceneObjectGroup(ObjectDeleting);
+                        DeleteSceneObject(ObjectDeleting);
                         ObjectDeleting = null;
                     }
                     else
-- 
cgit v1.1