aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-12 13:36:53 +0000
committerTeravus Ovares2007-12-12 13:36:53 +0000
commit2fd2e0285ccc54cfc5cd211841d59e20c1afeb2e (patch)
tree0ade013c65e1888592d7f839fdae8160ca1b0492
parent* Added some simstats to fill the simulator pane of the Statistics monitor. (diff)
downloadopensim-SC_OLD-2fd2e0285ccc54cfc5cd211841d59e20c1afeb2e.zip
opensim-SC_OLD-2fd2e0285ccc54cfc5cd211841d59e20c1afeb2e.tar.gz
opensim-SC_OLD-2fd2e0285ccc54cfc5cd211841d59e20c1afeb2e.tar.bz2
opensim-SC_OLD-2fd2e0285ccc54cfc5cd211841d59e20c1afeb2e.tar.xz
* Killed hard coded heart after stats update
* Did some voodoo math on the sim FPS to make the values 0-50
-rw-r--r--OpenSim/Framework/RegionInfo.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SimStatsReporter.cs11
2 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index bd896bd..fba78a9 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -213,7 +213,7 @@ namespace OpenSim.Framework
213 { 213 {
214 m_estateSettings = new EstateSettings(); 214 m_estateSettings = new EstateSettings();
215 } 215 }
216 216
217 return m_estateSettings; 217 return m_estateSettings;
218 } 218 }
219 } 219 }
diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
index 55bd6a7..b0f0e06 100644
--- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
@@ -59,7 +59,14 @@ namespace OpenSim.Region.Environment.Scenes
59 statpack.Region = new SimStatsPacket.RegionBlock(); 59 statpack.Region = new SimStatsPacket.RegionBlock();
60 statpack.Region.RegionX = ReportingRegion.RegionLocX; 60 statpack.Region.RegionX = ReportingRegion.RegionLocX;
61 statpack.Region.RegionY = ReportingRegion.RegionLocY; 61 statpack.Region.RegionY = ReportingRegion.RegionLocY;
62 statpack.Region.RegionFlags = (uint)21; 62 try
63 {
64 statpack.Region.RegionFlags = (uint)ReportingRegion.EstateSettings.regionFlags;
65 }
66 catch
67 {
68 statpack.Region.RegionFlags = (uint)0;
69 }
63 statpack.Region.ObjectCapacity = (uint)15000; 70 statpack.Region.ObjectCapacity = (uint)15000;
64 71
65 sb[0] = new SimStatsPacket.StatBlock(); 72 sb[0] = new SimStatsPacket.StatBlock();
@@ -68,7 +75,7 @@ namespace OpenSim.Region.Environment.Scenes
68 75
69 sb[1] = new SimStatsPacket.StatBlock(); 76 sb[1] = new SimStatsPacket.StatBlock();
70 sb[1].StatID = (uint)Stats.SimFPS; 77 sb[1].StatID = (uint)Stats.SimFPS;
71 sb[1].StatValue = (int)(m_fps); 78 sb[1].StatValue = (int)(m_fps * 5);
72 79
73 sb[2] = new SimStatsPacket.StatBlock(); 80 sb[2] = new SimStatsPacket.StatBlock();
74 sb[2].StatID = (uint)Stats.PhysicsFPS; 81 sb[2].StatID = (uint)Stats.PhysicsFPS;