ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent an object with a null RootPart in delete queue from stopping

Browse Source 
the deleting of other, valid objects
This commit is contained in:
Melanie Thielker
2008-10-22 03:49:38 +00:00
parent f9b3ef32c6
commit a8523dddb6
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,10 +119,19 @@ namespace OpenSim.Region.Environment.Scenes
"[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left);
x = m_inventoryDeletes.Dequeue();
m_scene.DeleteToInventory(x.destination,
x.folderID, x.objectGroup, x.remoteClient,
x.permissionToDelete);
if (x.objectGroup.RootObject != null)
{
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());
}
}
return true;
}
}