aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2012-02-10 23:59:10 +0000
committerMelanie2012-02-10 23:59:10 +0000
commitacfe7e555e41b84ede44db1978dcd23434be580d (patch)
tree4e5ca15b8661371ca397a7f73803b289d9e0faa5 /OpenSim/Region/Framework/Scenes
parentChange parser to leave embedded quotes alone if the pattern is recognized (diff)
parentChange parser to leave embedded quotes alone if the pattern is recognized (diff)
downloadopensim-SC_OLD-acfe7e555e41b84ede44db1978dcd23434be580d.zip
opensim-SC_OLD-acfe7e555e41b84ede44db1978dcd23434be580d.tar.gz
opensim-SC_OLD-acfe7e555e41b84ede44db1978dcd23434be580d.tar.bz2
opensim-SC_OLD-acfe7e555e41b84ede44db1978dcd23434be580d.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-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 {