diff options
author | Melanie | 2011-10-12 07:24:13 +0100 |
---|---|---|
committer | Melanie | 2011-10-12 07:24:13 +0100 |
commit | cc637b78fb24db31e1706de15ff1a2108001c52e (patch) | |
tree | d15b17d86e6bfba0c84b8d9ad942b8b928d7f5a2 /OpenSim/Region/Framework | |
parent | Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge (diff) | |
parent | Convert getLastReportedSimFPS() and getLastReportedSimStats() into more idiom... (diff) | |
download | opensim-SC-cc637b78fb24db31e1706de15ff1a2108001c52e.zip opensim-SC-cc637b78fb24db31e1706de15ff1a2108001c52e.tar.gz opensim-SC-cc637b78fb24db31e1706de15ff1a2108001c52e.tar.bz2 opensim-SC-cc637b78fb24db31e1706de15ff1a2108001c52e.tar.xz |
Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index ad64b55..b9d38d0 100644 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
@@ -78,6 +78,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
78 | UnAckedBytes = 24, | 78 | UnAckedBytes = 24, |
79 | } | 79 | } |
80 | 80 | ||
81 | /// <summary> | ||
82 | /// This is for llGetRegionFPS | ||
83 | /// </summary> | ||
84 | public float LastReportedSimFPS | ||
85 | { | ||
86 | get { return lastReportedSimFPS; } | ||
87 | } | ||
88 | |||
89 | public float[] LastReportedSimStats | ||
90 | { | ||
91 | get { return lastReportedSimStats; } | ||
92 | } | ||
93 | |||
81 | // Sending a stats update every 3 seconds- | 94 | // Sending a stats update every 3 seconds- |
82 | private int statsUpdatesEveryMS = 3000; | 95 | private int statsUpdatesEveryMS = 3000; |
83 | private float statsUpdateFactor = 0; | 96 | private float statsUpdateFactor = 0; |
@@ -437,19 +450,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
437 | m_activeScripts = count; | 450 | m_activeScripts = count; |
438 | } | 451 | } |
439 | 452 | ||
440 | /// <summary> | ||
441 | /// This is for llGetRegionFPS | ||
442 | /// </summary> | ||
443 | public float getLastReportedSimFPS() | ||
444 | { | ||
445 | return lastReportedSimFPS; | ||
446 | } | ||
447 | |||
448 | public float[] getLastReportedSimStats() | ||
449 | { | ||
450 | return lastReportedSimStats; | ||
451 | } | ||
452 | |||
453 | public void AddPacketsStats(int inPackets, int outPackets, int unAckedBytes) | 453 | public void AddPacketsStats(int inPackets, int outPackets, int unAckedBytes) |
454 | { | 454 | { |
455 | AddInPackets(inPackets); | 455 | AddInPackets(inPackets); |