From f16cf1284011c2376dedc3ac23919c5eb6abab5d Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 17 Nov 2008 15:52:27 +0000 Subject: * Fix probable partial breakage of delete to inventory in last commit * Not nulling out parts and the root part allows the code to be simplified --- OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 6 +----- 1 file changed, 1 insertion(+), 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 cc8501d..5dd1654 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -1763,11 +1763,7 @@ namespace OpenSim.Region.Environment.Scenes } } } - - // Finally remove the item, for reals this time. - if (permissionToDelete) - DeleteSceneObject(objectGroup, false); - + return assetID; } -- cgit v1.1