aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-07-31 11:13:55 -0700
committerDiva Canto2013-07-31 11:13:55 -0700
commit87fcff9fc39f180ceb7d5511ca8bc23965fab17f (patch)
treecc644e987218b7034a0eee3ea5a8aa3fdd0b1edc
parentAvoid another null ref opportunity. (diff)
downloadopensim-SC_OLD-87fcff9fc39f180ceb7d5511ca8bc23965fab17f.zip
opensim-SC_OLD-87fcff9fc39f180ceb7d5511ca8bc23965fab17f.tar.gz
opensim-SC_OLD-87fcff9fc39f180ceb7d5511ca8bc23965fab17f.tar.bz2
opensim-SC_OLD-87fcff9fc39f180ceb7d5511ca8bc23965fab17f.tar.xz
HGWorldMapModule: check whether it's enabled or not.
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs6
1 files changed, 6 insertions, 0 deletions
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
77 77
78 public override void AddRegion(Scene scene) 78 public override void AddRegion(Scene scene)
79 { 79 {
80 if (!m_Enabled)
81 return;
82
80 base.AddRegion(scene); 83 base.AddRegion(scene);
81 84
82 scene.EventManager.OnClientClosed += new EventManager.ClientClosed(EventManager_OnClientClosed); 85 scene.EventManager.OnClientClosed += new EventManager.ClientClosed(EventManager_OnClientClosed);
@@ -84,6 +87,9 @@ namespace OpenSim.Region.CoreModules.Hypergrid
84 87
85 public override void RegionLoaded(Scene scene) 88 public override void RegionLoaded(Scene scene)
86 { 89 {
90 if (!m_Enabled)
91 return;
92
87 base.RegionLoaded(scene); 93 base.RegionLoaded(scene);
88 ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>(); 94 ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
89 95