OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup

0.9.1.0-post-fixes
UbitUmarov 2018-12-01 23:18:48 +00:00
parent 8c80572b02
commit 9cb0c51483
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
View File

@ -116,24 +116,25 @@ namespace OpenSim.Region.CoreModules.Framework
//m_log.DebugFormat("[SERVICE THROTTLE]: RegionHandleRequest {0}", regionID); //m_log.DebugFormat("[SERVICE THROTTLE]: RegionHandleRequest {0}", regionID);
Action action = delegate Action action = delegate
{ {
if(!client.IsActive) if(!client.IsActive || m_scenes.Count == 0 || m_scenes[0] == null )
return; {
client = null;
if(m_scenes.Count == 0)
return; return;
}
Scene baseScene = m_scenes[0]; Scene baseScene = m_scenes[0];
if(baseScene.ShuttingDown)
if(baseScene == null || baseScene.ShuttingDown) {
client = null;
return; return;
}
GridRegion r = baseScene.GridService.GetRegionByUUID(UUID.Zero, regionID); GridRegion r = baseScene.GridService.GetRegionByUUID(UUID.Zero, regionID);
if(!client.IsActive) if (client.IsActive && r != null && r.RegionHandle != 0)
return;
if (r != null && r.RegionHandle != 0)
client.SendRegionHandle(regionID, r.RegionHandle); client.SendRegionHandle(regionID, r.RegionHandle);
client = null;
}; };
m_processorJobEngine.QueueJob("regionHandle", action, regionID.ToString()); m_processorJobEngine.QueueJob("regionHandle", action, regionID.ToString());