* Fix probable partial breakage of delete to inventory in last commit
* Not nulling out parts and the root part allows the code to be simplified0.6.1-post-fixes
parent
d54b6608a7
commit
f16cf12840
|
@ -126,18 +126,16 @@ 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.IsDeleted)
|
||||
|
||||
try
|
||||
{
|
||||
try
|
||||
{
|
||||
m_scene.DeleteToInventory(x.destination,
|
||||
x.folderID, x.objectGroup, x.remoteClient,
|
||||
x.permissionToDelete);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.DebugFormat("Exception background deleting object: "+e.ToString());
|
||||
}
|
||||
m_scene.DeleteToInventory(x.destination,
|
||||
x.folderID, x.objectGroup, x.remoteClient,
|
||||
x.permissionToDelete);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.DebugFormat("Exception background deleting object: "+e.ToString());
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
|
@ -1763,11 +1763,7 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Finally remove the item, for reals this time.
|
||||
if (permissionToDelete)
|
||||
DeleteSceneObject(objectGroup, false);
|
||||
|
||||
|
||||
return assetID;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue