From 928733efc908e25ea460ca4724a8846a4fb71fa1 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 23 May 2017 03:26:32 +0100
Subject:  please DIE! PLEASE??

---
 OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/World')

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 5dcf326..00c8279 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -215,6 +215,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             m_scene.EventManager.OnNewClient -= OnNewClient;
             m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps;
 
+            m_scene.UnregisterModuleInterface<IWorldMapModule>(this);
+
             string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString();
             regionimage = regionimage.Replace("-", "");
             MainServer.Instance.RemoveLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(),
@@ -1148,7 +1150,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             List<MapBlockRequestData> thisRunData = new List<MapBlockRequestData>();
             while (true)
             {
-                m_mapBlockRequestEvent.WaitOne();
+                while(!m_mapBlockRequestEvent.WaitOne(4900))
+                {
+                    if(m_scene == null)
+                        return;
+                }
+
                 lock (m_mapBlockRequestEvent)
                 {
                     int total = 0;
-- 
cgit v1.1