add a few guard checks on serviceThrottlemodule

2017-05-05 17:44:33 +01:00 · 2017-05-05 17:44:33 +01:00 · 3bc64f638a
parent 3f641d98bd
commit 3bc64f638a
1 changed files with 9 additions and 1 deletions
--- a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
@ -119,7 +119,15 @@ namespace OpenSim.Region.CoreModules.Framework
                if(!client.IsActive)
                    return;

-                GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, regionID);
+                if(m_scenes.Count == 0)
+                    return;
+
+                Scene baseScene = m_scenes[0];
+
+                if(baseScene == null || baseScene.ShuttingDown)
+                    return;
+
+                GridRegion r = baseScene.GridService.GetRegionByUUID(UUID.Zero, regionID);

                if(!client.IsActive)
                    return;