aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorBlueWall2012-02-10 16:27:14 -0500
committerBlueWall2012-02-10 16:27:14 -0500
commit73f34de1f9e75688487cdc8cf9753b79c01f4c35 (patch)
tree53ba39138fcadba544acccd386791852b69cc09a /OpenSim/Region/Framework
parentFix: Covenant view fails after updates or cache-clean see mantis http://opens... (diff)
parentFix bug where somebody taking a copy of an object they didn't own that was re... (diff)
downloadopensim-SC-73f34de1f9e75688487cdc8cf9753b79c01f4c35.zip
opensim-SC-73f34de1f9e75688487cdc8cf9753b79c01f4c35.tar.gz
opensim-SC-73f34de1f9e75688487cdc8cf9753b79c01f4c35.tar.bz2
opensim-SC-73f34de1f9e75688487cdc8cf9753b79c01f4c35.tar.xz
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 5dfd3e0..f678d07 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -148,7 +148,8 @@ namespace OpenSim.Region.Framework.Scenes
148 x = m_inventoryDeletes.Dequeue(); 148 x = m_inventoryDeletes.Dequeue();
149 149
150 m_log.DebugFormat( 150 m_log.DebugFormat(
151 "[ASYNC DELETER]: Sending object to user's inventory, action {1}, count {2}, {0} item(s) remaining.", left, x.action, x.objectGroups.Count); 151 "[ASYNC DELETER]: Sending object to user's inventory, action {1}, count {2}, {0} item(s) remaining.",
152 left, x.action, x.objectGroups.Count);
152 153
153 try 154 try
154 { 155 {