diff options
| author | Melanie | 2013-05-16 21:59:14 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-16 21:59:14 +0100 |
| commit | 42c82b564ea0fe58376bffae2731bcedf4b842c7 (patch) | |
| tree | 7ed5d564f320c1dcf6b709a1436b584a59e74a5e /OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: remove long commented out scene cache clearing code in EntityTransferM... (diff) | |
| download | opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.zip opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.gz opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.bz2 opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SimStatsReporter.cs')
| -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 5398ab9..bf32251 100644 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
| @@ -290,6 +290,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 290 | 290 | ||
| 291 | private void statsHeartBeat(object sender, EventArgs e) | 291 | private void statsHeartBeat(object sender, EventArgs e) |
| 292 | { | 292 | { |
| 293 | if (!m_scene.Active) | ||
| 294 | return; | ||
| 295 | |||
| 293 | SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[23]; | 296 | SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[23]; |
| 294 | SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock(); | 297 | SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock(); |
| 295 | 298 | ||