aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
authorJeff Lee2009-11-22 18:10:46 -0500
committerMelanie2009-11-26 17:43:00 +0000
commitd39c300d11109553b75ca761d26dda278c0ad7dd (patch)
tree5e45b10aa3389eaddc4e2b5b39ba872af3087fc5 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parentFix a small bug. Trusted script crossings now work again (diff)
downloadopensim-SC_OLD-d39c300d11109553b75ca761d26dda278c0ad7dd.zip
opensim-SC_OLD-d39c300d11109553b75ca761d26dda278c0ad7dd.tar.gz
opensim-SC_OLD-d39c300d11109553b75ca761d26dda278c0ad7dd.tar.bz2
opensim-SC_OLD-d39c300d11109553b75ca761d26dda278c0ad7dd.tar.xz
Added osGetRegionStats() function, to return a number of sim statistics
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs15
2 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index fbbbfdc..5de23ad 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5784,6 +5784,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5784 m_host.AddScriptLPS(1); 5784 m_host.AddScriptLPS(1);
5785 return World.SimulatorFPS; 5785 return World.SimulatorFPS;
5786 } 5786 }
5787
5787 5788
5788 /* particle system rules should be coming into this routine as doubles, that is 5789 /* particle system rules should be coming into this routine as doubles, that is
5789 rule[0] should be an integer from this list and rule[1] should be the arg 5790 rule[0] should be an integer from this list and rule[1] should be the arg
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e72fa70..482bfbc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1948,5 +1948,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1948 1948
1949 return key.ToString(); 1949 return key.ToString();
1950 } 1950 }
1951
1952 public LSL_List osGetRegionStats()
1953 {
1954 CheckThreatLevel(ThreatLevel.High, "osGetRegionStats");
1955 m_host.AddScriptLPS(1);
1956 LSL_List ret = new LSL_List();
1957 float[] stats = World.SimulatorStats;
1958
1959 for (int i = 0; i < 21; i++)
1960 {
1961 ret.Add(new LSL_Float( stats[i] ));
1962 }
1963 return ret;
1964 }
1965
1951 } 1966 }
1952} 1967}