aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-08 00:15:15 +0100
committerJustin Clark-Casey (justincc)2011-10-08 00:15:15 +0100
commitff80113534182bbcbcb49a73035776134fb04e3e (patch)
treef4cd0b5b6fcc18bc3bc339116faaca490edd0d26 /OpenSim/Region
parentflip master version up to 0.7.3 (diff)
downloadopensim-SC_OLD-ff80113534182bbcbcb49a73035776134fb04e3e.zip
opensim-SC_OLD-ff80113534182bbcbcb49a73035776134fb04e3e.tar.gz
opensim-SC_OLD-ff80113534182bbcbcb49a73035776134fb04e3e.tar.bz2
opensim-SC_OLD-ff80113534182bbcbcb49a73035776134fb04e3e.tar.xz
Go back to lying that sim fps is 55 when it's actually locked at a maximum of 11.
We're been lying since 2008 so I'm sure another few years can't hurt. To know the real fps, either divide sim fps by 5 and/or look at the frame time.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SimStatsReporter.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 282b677..ad64b55 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -168,8 +168,12 @@ namespace OpenSim.Region.Framework.Scenes
168 168
169#region various statistic googly moogly 169#region various statistic googly moogly
170 170
171 // We're going to lie about the FPS because we've been lying since 2008. The actual FPS is currently
172 // locked at a maximum of 11. Maybe at some point this can change so that we're not lying.
173 int reportedFPS = m_fps * 5;
174
171 // save the reported value so there is something available for llGetRegionFPS 175 // save the reported value so there is something available for llGetRegionFPS
172 lastReportedSimFPS = (float)m_fps / statsUpdateFactor; 176 lastReportedSimFPS = reportedFPS / statsUpdateFactor;
173 177
174 float physfps = ((m_pfps / 1000)); 178 float physfps = ((m_pfps / 1000));
175 179
@@ -200,7 +204,7 @@ namespace OpenSim.Region.Framework.Scenes
200 sb[0].StatValue = (Single.IsNaN(m_timeDilation)) ? 0.1f : m_timeDilation ; //((((m_timeDilation + (0.10f * statsUpdateFactor)) /10) / statsUpdateFactor)); 204 sb[0].StatValue = (Single.IsNaN(m_timeDilation)) ? 0.1f : m_timeDilation ; //((((m_timeDilation + (0.10f * statsUpdateFactor)) /10) / statsUpdateFactor));
201 205
202 sb[1].StatID = (uint) Stats.SimFPS; 206 sb[1].StatID = (uint) Stats.SimFPS;
203 sb[1].StatValue = m_fps/statsUpdateFactor; 207 sb[1].StatValue = reportedFPS / statsUpdateFactor;
204 208
205 sb[2].StatID = (uint) Stats.PhysicsFPS; 209 sb[2].StatID = (uint) Stats.PhysicsFPS;
206 sb[2].StatValue = physfps / statsUpdateFactor; 210 sb[2].StatValue = physfps / statsUpdateFactor;