OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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
0.6.1-post-fixes
Justin Clarke Casey 2008-11-17 15:52:27 +00:00
parent d54b6608a7
commit f16cf12840
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
View File

@ -126,18 +126,16 @@ namespace OpenSim.Region.Environment.Scenes
"[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left); "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left);
x = m_inventoryDeletes.Dequeue(); x = m_inventoryDeletes.Dequeue();
if (!x.objectGroup.IsDeleted)
try
{ {
try m_scene.DeleteToInventory(x.destination,
{ x.folderID, x.objectGroup, x.remoteClient,
m_scene.DeleteToInventory(x.destination, x.permissionToDelete);
x.folderID, x.objectGroup, x.remoteClient, }
x.permissionToDelete); catch (Exception e)
} {
catch (Exception e) m_log.DebugFormat("Exception background deleting object: "+e.ToString());
{
m_log.DebugFormat("Exception background deleting object: "+e.ToString());
}
} }
return true; return true;

4
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -1764,10 +1764,6 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
// Finally remove the item, for reals this time.
if (permissionToDelete)
DeleteSceneObject(objectGroup, false);
return assetID; return assetID;
} }