aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2017-05-05 17:44:33 +0100
committerUbitUmarov2017-05-05 17:44:33 +0100
commit3bc64f638af9e28efda1d0b1ca9b0f0b45d88b0b (patch)
tree75219d7c815a337d7debab73f5900cf51883d7ff
parentAdded a fully functional groups data layer for testing. (diff)
downloadopensim-SC_OLD-3bc64f638af9e28efda1d0b1ca9b0f0b45d88b0b.zip
opensim-SC_OLD-3bc64f638af9e28efda1d0b1ca9b0f0b45d88b0b.tar.gz
opensim-SC_OLD-3bc64f638af9e28efda1d0b1ca9b0f0b45d88b0b.tar.bz2
opensim-SC_OLD-3bc64f638af9e28efda1d0b1ca9b0f0b45d88b0b.tar.xz
add a few guard checks on serviceThrottlemodule
-rw-r--r--OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs10
1 files changed, 9 insertions, 1 deletions
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
119 if(!client.IsActive) 119 if(!client.IsActive)
120 return; 120 return;
121 121
122 GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, regionID); 122 if(m_scenes.Count == 0)
123 return;
124
125 Scene baseScene = m_scenes[0];
126
127 if(baseScene == null || baseScene.ShuttingDown)
128 return;
129
130 GridRegion r = baseScene.GridService.GetRegionByUUID(UUID.Zero, regionID);
123 131
124 if(!client.IsActive) 132 if(!client.IsActive)
125 return; 133 return;