From 87fcff9fc39f180ceb7d5511ca8bc23965fab17f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 31 Jul 2013 11:13:55 -0700
Subject: HGWorldMapModule: check whether it's enabled or not.

---
 OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index a2aee08..cb22f0b 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -77,6 +77,9 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
         public override void AddRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             base.AddRegion(scene);
 
             scene.EventManager.OnClientClosed += new EventManager.ClientClosed(EventManager_OnClientClosed);
@@ -84,6 +87,9 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
         public override void RegionLoaded(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             base.RegionLoaded(scene);
             ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
 
-- 
cgit v1.1


From ac2ad9690d9e8b8988dc68cf4e2933c7b18a71bc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 31 Jul 2013 11:20:27 -0700
Subject: HGWorldMapModule: unregister event on RemoveRegion

---
 OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index cb22f0b..97227b3 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
             base.AddRegion(scene);
 
-            scene.EventManager.OnClientClosed += new EventManager.ClientClosed(EventManager_OnClientClosed);
+            scene.EventManager.OnClientClosed += EventManager_OnClientClosed;
         }
 
         public override void RegionLoaded(Scene scene)
@@ -99,6 +99,15 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             m_UserManagement = m_scene.RequestModuleInterface<IUserManagement>();
 
         }
+
+        public override void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            scene.EventManager.OnClientClosed -= EventManager_OnClientClosed;
+        }
+
         public override string Name
         {
             get { return "HGWorldMap"; }
-- 
cgit v1.1