Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2013-05-15 22:06:01 +01:00 · 2013-05-15 22:06:01 +01:00 · a4290cdbb3
parent 177a53fbcf 23ebae1828
commit a4290cdbb3
1 changed files with 3 additions and 0 deletions
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@ -289,6 +289,9 @@ namespace OpenSim.Region.Framework.Scenes

        private void statsHeartBeat(object sender, EventArgs e)
        {
+            if (!m_scene.Active)
+                return;
+
            SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[22];
            SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock();