aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
diff options
context:
space:
mode:
authorMelanie2011-10-12 07:23:40 +0100
committerMelanie2011-10-12 07:23:40 +0100
commit98ae98510cbbb693d90dba9f8f212e02130fe87f (patch)
treeebb5a8e360974606b1fa8f70006c1d7676da9a9c /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
parentMerge commit '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmerge (diff)
parentrefactor: have lsl and ossl interrogate scene.StatsReporter directly rather t... (diff)
downloadopensim-SC_OLD-98ae98510cbbb693d90dba9f8f212e02130fe87f.zip
opensim-SC_OLD-98ae98510cbbb693d90dba9f8f212e02130fe87f.tar.gz
opensim-SC_OLD-98ae98510cbbb693d90dba9f8f212e02130fe87f.tar.bz2
opensim-SC_OLD-98ae98510cbbb693d90dba9f8f212e02130fe87f.tar.xz
Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 8f450f8..9aeb98e 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.SimulatorStats; 2473 float[] stats = World.StatsReporter.getLastReportedSimStats();
2474 2474
2475 for (int i = 0; i < 21; i++) 2475 for (int i = 0; i < 21; i++)
2476 { 2476 {