HGWorldMapModule: unregister event on RemoveRegion

HGWorldMapModule: check whether it's enabled or not.
Avoid another null ref opportunity.
2013-07-31 11:20:27 -07:00 · 2013-07-31 11:13:55 -07:00 · 2013-07-30 22:07:33 -07:00 · 2013-07-30 21:38:41 -07:00
1 changed files with 18 additions and 3 deletions
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid

                m_MapImageServerURL = Util.GetConfigVarFromSections<string>(source, "MapTileURL", new string[] {"LoginService", "HGWorldMap", "SimulatorFeatures"});

-                if (m_MapImageServerURL != string.Empty)
+                if (!string.IsNullOrEmpty(m_MapImageServerURL))
                {
                    m_MapImageServerURL = m_MapImageServerURL.Trim();
                    if (!m_MapImageServerURL.EndsWith("/"))
@@ -77,13 +77,19 @@ 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);
+            scene.EventManager.OnClientClosed += EventManager_OnClientClosed;
        }

        public override void RegionLoaded(Scene scene)
        {
+            if (!m_Enabled)
+                return;
+
            base.RegionLoaded(scene);
            ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();

@@ -93,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"; }
@@ -146,7 +161,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid

        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
        {
-            if (m_UserManagement != null && !m_UserManagement.IsLocalGridUser(agentID) && m_MapImageServerURL != string.Empty)
+            if (m_UserManagement != null && !string.IsNullOrEmpty(m_MapImageServerURL) && !m_UserManagement.IsLocalGridUser(agentID))
            {
                OSD extras = new OSDMap();
                if (features.ContainsKey("OpenSimExtras"))
Author	SHA1	Message	Date
Diva Canto	ac2ad9690d	HGWorldMapModule: unregister event on RemoveRegion	2013-07-31 11:20:27 -07:00
Diva Canto	87fcff9fc3	HGWorldMapModule: check whether it's enabled or not.	2013-07-31 11:13:55 -07:00
Diva Canto	3c540f0d33	Avoid another null ref opportunity.	2013-07-30 22:07:33 -07:00
Diva Canto	e4ecbc2b10	Fix null ref.	2013-07-30 21:38:41 -07:00