ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

please DIE! PLEASE??

Browse Source
This commit is contained in:
UbitUmarov
2017-05-23 03:26:32 +01:00
parent 7b80bcc57a
commit 928733efc9
7 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
View File

@@ -106,6 +106,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid
if (!m_Enabled)
return;
base.RemoveRegion(scene);
scene.EventManager.OnClientClosed -= EventManager_OnClientClosed;
}

1
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
View File

@@ -415,6 +415,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
public void Close()
{
ThreadPool.Shutdown();
}
public string Name

9
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@@ -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;