diff options
| author | Justin Clark-Casey (justincc) | 2013-05-15 22:06:01 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-05-15 22:06:01 +0100 |
| commit | a4290cdbb3ea3ffe7784949b5ee61a92dcba2701 (patch) | |
| tree | 126a2ad918ad15ff8b4c2627ca12b9f0e35fea8f | |
| parent | Fix issue where osMakeNotecard() would fail if given a list containing vector... (diff) | |
| parent | Eliminate race condition where SimStatsReporter starts reporting (diff) | |
| download | opensim-SC_OLD-a4290cdbb3ea3ffe7784949b5ee61a92dcba2701.zip opensim-SC_OLD-a4290cdbb3ea3ffe7784949b5ee61a92dcba2701.tar.gz opensim-SC_OLD-a4290cdbb3ea3ffe7784949b5ee61a92dcba2701.tar.bz2 opensim-SC_OLD-a4290cdbb3ea3ffe7784949b5ee61a92dcba2701.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index b9d615e..95f9caf 100644 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
| @@ -289,6 +289,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 289 | 289 | ||
| 290 | private void statsHeartBeat(object sender, EventArgs e) | 290 | private void statsHeartBeat(object sender, EventArgs e) |
| 291 | { | 291 | { |
| 292 | if (!m_scene.Active) | ||
| 293 | return; | ||
| 294 | |||
| 292 | SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[22]; | 295 | SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[22]; |
| 293 | SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock(); | 296 | SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock(); |
| 294 | 297 | ||