diff options
author | Melanie | 2010-01-04 21:41:33 +0000 |
---|---|---|
committer | Melanie | 2010-01-04 21:41:33 +0000 |
commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |
parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
parent | Finish conversion if XInventoryService (diff) | |
download | opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz |
Merge branch 'master' into presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index e368c2a..fd23294 100644 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
82 | private int m_fps = 0; | 82 | private int m_fps = 0; |
83 | // saved last reported value so there is something available for llGetRegionFPS | 83 | // saved last reported value so there is something available for llGetRegionFPS |
84 | private float lastReportedSimFPS = 0; | 84 | private float lastReportedSimFPS = 0; |
85 | private float[] lastReportedSimStats = new float[21]; | 85 | private float[] lastReportedSimStats = new float[21]; |
86 | private float m_pfps = 0; | 86 | private float m_pfps = 0; |
87 | private int m_agentUpdates = 0; | 87 | private int m_agentUpdates = 0; |
88 | 88 | ||
@@ -263,11 +263,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
263 | 263 | ||
264 | sb[20].StatID = (uint)Stats.ScriptLinesPerSecond; | 264 | sb[20].StatID = (uint)Stats.ScriptLinesPerSecond; |
265 | sb[20].StatValue = m_scriptLinesPerSecond / statsUpdateFactor; | 265 | sb[20].StatValue = m_scriptLinesPerSecond / statsUpdateFactor; |
266 | 266 | ||
267 | for (int i = 0; i < 21; i++) | 267 | for (int i = 0; i < 21; i++) |
268 | { | 268 | { |
269 | lastReportedSimStats[i] = sb[i].StatValue; | 269 | lastReportedSimStats[i] = sb[i].StatValue; |
270 | } | 270 | } |
271 | 271 | ||
272 | SimStats simStats | 272 | SimStats simStats |
273 | = new SimStats( | 273 | = new SimStats( |
@@ -447,11 +447,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
447 | { | 447 | { |
448 | return lastReportedSimFPS; | 448 | return lastReportedSimFPS; |
449 | } | 449 | } |
450 | 450 | ||
451 | public float[] getLastReportedSimStats() | 451 | public float[] getLastReportedSimStats() |
452 | { | 452 | { |
453 | return lastReportedSimStats; | 453 | return lastReportedSimStats; |
454 | } | 454 | } |
455 | 455 | ||
456 | public void AddPacketsStats(int inPackets, int outPackets, int unAckedBytes) | 456 | public void AddPacketsStats(int inPackets, int outPackets, int unAckedBytes) |
457 | { | 457 | { |