diff options
| author | Robert Adams | 2013-05-14 13:40:07 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-05-14 18:45:27 -0700 |
| commit | cfbb4f52e444b8e7342ff37b9e7231a76d110265 (patch) | |
| tree | bd23645181d3932ba8a77c69b3b2d3a516a354b3 /OpenSim/Region/Framework/Scenes | |
| parent | BulletSim: Fix for mantis 6487, also minor adjustment to fix flying while you... (diff) | |
| download | opensim-SC_OLD-cfbb4f52e444b8e7342ff37b9e7231a76d110265.zip opensim-SC_OLD-cfbb4f52e444b8e7342ff37b9e7231a76d110265.tar.gz opensim-SC_OLD-cfbb4f52e444b8e7342ff37b9e7231a76d110265.tar.bz2 opensim-SC_OLD-cfbb4f52e444b8e7342ff37b9e7231a76d110265.tar.xz | |
Eliminate race condition where SimStatsReporter starts reporting
stats before the region is completely initialized.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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 | ||