* minor: slightly pointlessly increase the verbosity of the message given when a queued deletion from scene to inventory fails because the root part of the group has been zapped
parent
5469c0d6f8
commit
07019c6a84
|
@ -1563,7 +1563,8 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
|
||||
private bool InventoryDeQueueAndDelete()
|
||||
{
|
||||
DeleteToInventoryHolder x;
|
||||
DeleteToInventoryHolder x = null;
|
||||
|
||||
try
|
||||
{
|
||||
lock (m_inventoryDeletes)
|
||||
|
@ -1577,9 +1578,14 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
return true;
|
||||
}
|
||||
}
|
||||
} catch(Exception e)
|
||||
}
|
||||
catch(Exception e)
|
||||
{
|
||||
m_log.Error(e.ToString());
|
||||
// We can't put the object group details in here since the root part may have disappeared (which is where these sit).
|
||||
// FIXME: This needs to be fixed.
|
||||
m_log.ErrorFormat(
|
||||
"[AGENT INVENTORY]: Queued deletion of scene object to agent {0} {1} failed: {2}",
|
||||
(x != null ? x.remoteClient.Name : "unavailable"), (x != null ? x.remoteClient.AgentId : "unavailable"), e.ToString());
|
||||
}
|
||||
|
||||
m_log.Info("No objects left in inventory delete queue.");
|
||||
|
|
Loading…
Reference in New Issue