diff options
author | UbitUmarov | 2017-05-23 03:26:32 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-23 03:26:32 +0100 |
commit | 928733efc908e25ea460ca4724a8846a4fb71fa1 (patch) | |
tree | b6714acf2088da56367ef3a11acf85fe48873bbe /OpenSim/Region/CoreModules/World | |
parent | no all mono versions know DnsRefreshTimeout (diff) | |
download | opensim-SC-928733efc908e25ea460ca4724a8846a4fb71fa1.zip opensim-SC-928733efc908e25ea460ca4724a8846a4fb71fa1.tar.gz opensim-SC-928733efc908e25ea460ca4724a8846a4fb71fa1.tar.bz2 opensim-SC-928733efc908e25ea460ca4724a8846a4fb71fa1.tar.xz |
please DIE! PLEASE??
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 9 |
1 files changed, 8 insertions, 1 deletions
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 | |||
215 | m_scene.EventManager.OnNewClient -= OnNewClient; | 215 | m_scene.EventManager.OnNewClient -= OnNewClient; |
216 | m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps; | 216 | m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps; |
217 | 217 | ||
218 | m_scene.UnregisterModuleInterface<IWorldMapModule>(this); | ||
219 | |||
218 | string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); | 220 | string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); |
219 | regionimage = regionimage.Replace("-", ""); | 221 | regionimage = regionimage.Replace("-", ""); |
220 | MainServer.Instance.RemoveLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), | 222 | MainServer.Instance.RemoveLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), |
@@ -1148,7 +1150,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1148 | List<MapBlockRequestData> thisRunData = new List<MapBlockRequestData>(); | 1150 | List<MapBlockRequestData> thisRunData = new List<MapBlockRequestData>(); |
1149 | while (true) | 1151 | while (true) |
1150 | { | 1152 | { |
1151 | m_mapBlockRequestEvent.WaitOne(); | 1153 | while(!m_mapBlockRequestEvent.WaitOne(4900)) |
1154 | { | ||
1155 | if(m_scene == null) | ||
1156 | return; | ||
1157 | } | ||
1158 | |||
1152 | lock (m_mapBlockRequestEvent) | 1159 | lock (m_mapBlockRequestEvent) |
1153 | { | 1160 | { |
1154 | int total = 0; | 1161 | int total = 0; |