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

Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge

avinationmerge
Melanie 2011-10-12 07:23:40 +01:00
parent 5d3acc9ac3 2b290793ab
commit 98ae98510c
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -532,19 +532,6 @@ namespace OpenSim.Region.Framework.Scenes
get { return m_sceneGraph.m_syncRoot; } get { return m_sceneGraph.m_syncRoot; }
} }
/// <summary>
/// This is for llGetRegionFPS
/// </summary>
public float SimulatorFPS
{
get { return StatsReporter.getLastReportedSimFPS(); }
}
public float[] SimulatorStats
{
get { return StatsReporter.getLastReportedSimStats(); }
}
public string DefaultScriptEngine public string DefaultScriptEngine
{ {
get { return m_defaultScriptEngine; } get { return m_defaultScriptEngine; }

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.SimulatorFPS; return World.StatsReporter.getLastReportedSimFPS();
} }

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.SimulatorStats; float[] stats = World.StatsReporter.getLastReportedSimStats();
for (int i = 0; i < 21; i++) for (int i = 0; i < 21; i++)
{ {