OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge

avinationmerge
Melanie 2011-10-12 07:24:13 +01:00
parent ad46ad1ab2 19096bd391
commit cc637b78fb
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
View File

@ -78,6 +78,19 @@ namespace OpenSim.Region.Framework.Scenes
UnAckedBytes = 24, UnAckedBytes = 24,
} }
/// <summary>
/// This is for llGetRegionFPS
/// </summary>
public float LastReportedSimFPS
{
get { return lastReportedSimFPS; }
}
public float[] LastReportedSimStats
{
get { return lastReportedSimStats; }
}
// Sending a stats update every 3 seconds- // Sending a stats update every 3 seconds-
private int statsUpdatesEveryMS = 3000; private int statsUpdatesEveryMS = 3000;
private float statsUpdateFactor = 0; private float statsUpdateFactor = 0;
@ -437,19 +450,6 @@ namespace OpenSim.Region.Framework.Scenes
m_activeScripts = count; m_activeScripts = count;
} }
/// <summary>
/// This is for llGetRegionFPS
/// </summary>
public float getLastReportedSimFPS()
{
return lastReportedSimFPS;
}
public float[] getLastReportedSimStats()
{
return lastReportedSimStats;
}
public void AddPacketsStats(int inPackets, int outPackets, int unAckedBytes) public void AddPacketsStats(int inPackets, int outPackets, int unAckedBytes)
{ {
AddInPackets(inPackets); AddInPackets(inPackets);

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -6383,7 +6383,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Float llGetRegionFPS() public LSL_Float llGetRegionFPS()
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
return World.StatsReporter.getLastReportedSimFPS(); return World.StatsReporter.LastReportedSimFPS;
} }

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -2470,7 +2470,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats"); CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
LSL_List ret = new LSL_List(); LSL_List ret = new LSL_List();
float[] stats = World.StatsReporter.getLastReportedSimStats(); float[] stats = World.StatsReporter.LastReportedSimStats;
for (int i = 0; i < 21; i++) for (int i = 0; i < 21; i++)
{ {