From 3bc64f638af9e28efda1d0b1ca9b0f0b45d88b0b Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 5 May 2017 17:44:33 +0100
Subject: add a few guard checks on serviceThrottlemodule

---
 .../Framework/ServiceThrottle/ServiceThrottleModule.cs         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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

diff --git a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
index 924a1a3..2c74c0e 100644
--- 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;
-- 
cgit v1.1