From a814ac3d671880474ca35dd1934e8ea7a9a6f81b Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 11 Nov 2008 20:33:29 +0000
Subject: * Put an Enabled switch on the async object deleter for future
testing purposes
---
.../Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs')
diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
index ca28bbd..706ba6a 100644
--- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -54,9 +54,14 @@ namespace OpenSim.Region.Environment.Scenes
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ ///
+ /// Is the deleter currently enabled?
+ ///
+ public bool Enabled;
+
private Timer m_inventoryTicker = new Timer(2000);
private readonly Queue m_inventoryDeletes = new Queue();
- private Scene m_scene;
+ private Scene m_scene;
public AsyncSceneObjectGroupDeleter(Scene scene)
{
@@ -73,7 +78,8 @@ namespace OpenSim.Region.Environment.Scenes
SceneObjectGroup objectGroup, IClientAPI remoteClient,
bool permissionToDelete)
{
- m_inventoryTicker.Stop();
+ if (Enabled)
+ m_inventoryTicker.Stop();
lock (m_inventoryDeletes)
{
@@ -87,7 +93,8 @@ namespace OpenSim.Region.Environment.Scenes
m_inventoryDeletes.Enqueue(dtis);
}
- m_inventoryTicker.Start();
+ if (Enabled)
+ m_inventoryTicker.Start();
// Visually remove it, even if it isnt really gone yet.
if (permissionToDelete)
@@ -132,6 +139,7 @@ namespace OpenSim.Region.Environment.Scenes
m_log.DebugFormat("Exception background deleting object: "+e.ToString());
}
}
+
return true;
}
}
--
cgit v1.1