From 2c34619aea074446e53dde80d397973075914bac Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Fri, 23 Oct 2009 14:22:21 -0700
Subject: * Changed various modules to not initialize timers unless the module
 is initialized. Ideally, the timers would not initialize unless the module
 was actually enabled, but Melanie's work on configuring module loading from a
 config file should make that unnecessary * Wrapped the Bitmap class used to
 generate the world map tile in a using statement to dispose of it after the
 JPEG2000 data is created

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a3bc04b..47b13bd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -891,6 +891,9 @@ namespace OpenSim.Region.Framework.Scenes
         {
             m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName);
 
+            m_restartTimer.Stop();
+            m_restartTimer.Close();
+
             // Kick all ROOT agents with the message, 'The simulator is going down'
             ForEachScenePresence(delegate(ScenePresence avatar)
                                  {
-- 
cgit v1.1