aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-08-05 16:37:06 +0000
committerJustin Clarke Casey2008-08-05 16:37:06 +0000
commit07019c6a84673b2afdd536ed5cde28278f39a89c (patch)
tree47afeb3fd8bdd41685752e6c56cd279fa885add6 /OpenSim/Region/Environment
parentFix one more instance of a bad bit value for the collision event (diff)
downloadopensim-SC_OLD-07019c6a84673b2afdd536ed5cde28278f39a89c.zip
opensim-SC_OLD-07019c6a84673b2afdd536ed5cde28278f39a89c.tar.gz
opensim-SC_OLD-07019c6a84673b2afdd536ed5cde28278f39a89c.tar.bz2
opensim-SC_OLD-07019c6a84673b2afdd536ed5cde28278f39a89c.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index d0beac3..23dd8b6 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1563,7 +1563,8 @@ namespace OpenSim.Region.Environment.Scenes
1563 1563
1564 private bool InventoryDeQueueAndDelete() 1564 private bool InventoryDeQueueAndDelete()
1565 { 1565 {
1566 DeleteToInventoryHolder x; 1566 DeleteToInventoryHolder x = null;
1567
1567 try 1568 try
1568 { 1569 {
1569 lock (m_inventoryDeletes) 1570 lock (m_inventoryDeletes)
@@ -1577,9 +1578,14 @@ namespace OpenSim.Region.Environment.Scenes
1577 return true; 1578 return true;
1578 } 1579 }
1579 } 1580 }
1580 } catch(Exception e) 1581 }
1582 catch(Exception e)
1581 { 1583 {
1582 m_log.Error(e.ToString()); 1584 // We can't put the object group details in here since the root part may have disappeared (which is where these sit).
1585 // FIXME: This needs to be fixed.
1586 m_log.ErrorFormat(
1587 "[AGENT INVENTORY]: Queued deletion of scene object to agent {0} {1} failed: {2}",
1588 (x != null ? x.remoteClient.Name : "unavailable"), (x != null ? x.remoteClient.AgentId : "unavailable"), e.ToString());
1583 } 1589 }
1584 1590
1585 m_log.Info("No objects left in inventory delete queue."); 1591 m_log.Info("No objects left in inventory delete queue.");