aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2013-05-14 13:40:07 -0700
committerRobert Adams2013-05-14 13:40:07 -0700
commit23ebae1828a540a7754dafae1794467582fe35d5 (patch)
tree15a0e3da88c1fdce7667880b4050745b6f0d171f
parentComment out log message about looking for asset data in remove asset service ... (diff)
downloadopensim-SC_OLD-23ebae1828a540a7754dafae1794467582fe35d5.zip
opensim-SC_OLD-23ebae1828a540a7754dafae1794467582fe35d5.tar.gz
opensim-SC_OLD-23ebae1828a540a7754dafae1794467582fe35d5.tar.bz2
opensim-SC_OLD-23ebae1828a540a7754dafae1794467582fe35d5.tar.xz
Eliminate race condition where SimStatsReporter starts reporting
stats before the region is completely initialized.
-rw-r--r--OpenSim/Region/Framework/Scenes/SimStatsReporter.cs3
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