aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2011-10-12 07:24:13 +0100
committerMelanie2011-10-12 07:24:13 +0100
commitcc637b78fb24db31e1706de15ff1a2108001c52e (patch)
treed15b17d86e6bfba0c84b8d9ad942b8b928d7f5a2 /OpenSim/Region/ScriptEngine
parentMerge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge (diff)
parentConvert getLastReportedSimFPS() and getLastReportedSimStats() into more idiom... (diff)
downloadopensim-SC_OLD-cc637b78fb24db31e1706de15ff1a2108001c52e.zip
opensim-SC_OLD-cc637b78fb24db31e1706de15ff1a2108001c52e.tar.gz
opensim-SC_OLD-cc637b78fb24db31e1706de15ff1a2108001c52e.tar.bz2
opensim-SC_OLD-cc637b78fb24db31e1706de15ff1a2108001c52e.tar.xz
Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d7581cc..db3d403 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6383,7 +6383,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6383 public LSL_Float llGetRegionFPS() 6383 public LSL_Float llGetRegionFPS()
6384 { 6384 {
6385 m_host.AddScriptLPS(1); 6385 m_host.AddScriptLPS(1);
6386 return World.StatsReporter.getLastReportedSimFPS(); 6386 return World.StatsReporter.LastReportedSimFPS;
6387 } 6387 }
6388 6388
6389 6389
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 9aeb98e..bd97f76 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2470,7 +2470,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2470 CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats"); 2470 CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats");
2471 m_host.AddScriptLPS(1); 2471 m_host.AddScriptLPS(1);
2472 LSL_List ret = new LSL_List(); 2472 LSL_List ret = new LSL_List();
2473 float[] stats = World.StatsReporter.getLastReportedSimStats(); 2473 float[] stats = World.StatsReporter.LastReportedSimStats;
2474 2474
2475 for (int i = 0; i < 21; i++) 2475 for (int i = 0; i < 21; i++)
2476 { 2476 {