diff options
author | Melanie | 2009-11-26 17:45:09 +0000 |
---|---|---|
committer | Melanie | 2009-11-26 17:45:09 +0000 |
commit | ed148eba324cf72b4100f83f6d5f7cb35cb46bba (patch) | |
tree | b8f813d74183776a70b6752e5b409dcc169de019 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.zip opensim-SC-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.tar.gz opensim-SC-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.tar.bz2 opensim-SC-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 22 |
2 files changed, 23 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 6e5436a..8274fbf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -5840,6 +5840,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5840 | m_host.AddScriptLPS(1); | 5840 | m_host.AddScriptLPS(1); |
5841 | return World.SimulatorFPS; | 5841 | return World.SimulatorFPS; |
5842 | } | 5842 | } |
5843 | |||
5843 | 5844 | ||
5844 | /* particle system rules should be coming into this routine as doubles, that is | 5845 | /* particle system rules should be coming into this routine as doubles, that is |
5845 | rule[0] should be an integer from this list and rule[1] should be the arg | 5846 | 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 10165d3..7f739b1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1952,5 +1952,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1952 | 1952 | ||
1953 | return key.ToString(); | 1953 | return key.ToString(); |
1954 | } | 1954 | } |
1955 | |||
1956 | /// <summary> | ||
1957 | /// Return information regarding various simulator statistics (sim fps, physics fps, time | ||
1958 | /// dilation, total number of prims, total number of active scripts, script lps, various | ||
1959 | /// timing data, packets in/out, etc. Basically much the information that's shown in the | ||
1960 | /// client's Statistics Bar (Ctrl-Shift-1) | ||
1961 | /// </summary> | ||
1962 | /// <returns>List of floats</returns> | ||
1963 | public LSL_List osGetRegionStats() | ||
1964 | { | ||
1965 | CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats"); | ||
1966 | m_host.AddScriptLPS(1); | ||
1967 | LSL_List ret = new LSL_List(); | ||
1968 | float[] stats = World.SimulatorStats; | ||
1969 | |||
1970 | for (int i = 0; i < 21; i++) | ||
1971 | { | ||
1972 | ret.Add(new LSL_Float( stats[i] )); | ||
1973 | } | ||
1974 | return ret; | ||
1975 | } | ||
1976 | |||
1955 | } | 1977 | } |
1956 | } | 1978 | } |