From 2fd2e0285ccc54cfc5cd211841d59e20c1afeb2e Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Wed, 12 Dec 2007 13:36:53 +0000 Subject: [PATCH] * Killed hard coded heart after stats update * Did some voodoo math on the sim FPS to make the values 0-50 --- OpenSim/Framework/RegionInfo.cs | 2 +- OpenSim/Region/Environment/Scenes/SimStatsReporter.cs | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index bd896bd392..fba78a95e3 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -213,7 +213,7 @@ namespace OpenSim.Framework { m_estateSettings = new EstateSettings(); } - + return m_estateSettings; } } diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs index 55bd6a7fa5..b0f0e06d89 100644 --- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs @@ -59,7 +59,14 @@ namespace OpenSim.Region.Environment.Scenes statpack.Region = new SimStatsPacket.RegionBlock(); statpack.Region.RegionX = ReportingRegion.RegionLocX; statpack.Region.RegionY = ReportingRegion.RegionLocY; - statpack.Region.RegionFlags = (uint)21; + try + { + statpack.Region.RegionFlags = (uint)ReportingRegion.EstateSettings.regionFlags; + } + catch + { + statpack.Region.RegionFlags = (uint)0; + } statpack.Region.ObjectCapacity = (uint)15000; sb[0] = new SimStatsPacket.StatBlock(); @@ -68,7 +75,7 @@ namespace OpenSim.Region.Environment.Scenes sb[1] = new SimStatsPacket.StatBlock(); sb[1].StatID = (uint)Stats.SimFPS; - sb[1].StatValue = (int)(m_fps); + sb[1].StatValue = (int)(m_fps * 5); sb[2] = new SimStatsPacket.StatBlock(); sb[2].StatID = (uint)Stats.PhysicsFPS;