aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
diff options
context:
space:
mode:
authorUbitUmarov2017-10-15 14:46:21 +0100
committerUbitUmarov2017-10-15 14:46:21 +0100
commit3d6553afeee3d4605851b6f336c17d5a6b07c6ad (patch)
tree37004036b982eff88882f131ff74017e85601955 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
parentMerge branch 'master' of git://opensimulator.org/git/opensim (Ubit beat (diff)
downloadopensim-SC-3d6553afeee3d4605851b6f336c17d5a6b07c6ad.zip
opensim-SC-3d6553afeee3d4605851b6f336c17d5a6b07c6ad.tar.gz
opensim-SC-3d6553afeee3d4605851b6f336c17d5a6b07c6ad.tar.bz2
opensim-SC-3d6553afeee3d4605851b6f336c17d5a6b07c6ad.tar.xz
add osGetSimulatorMemoryKB(). This allows work around the fact osGetSimulatorMemory() reports at most 2GB. This one limit is now 2TB, should ne enought for a while
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 23ea215..30ff764 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -958,7 +958,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
958 958
959 /// <summary> 959 /// <summary>
960 /// Returns the amount of memory in use by the Simulator Daemon. 960 /// Returns the amount of memory in use by the Simulator Daemon.
961 /// Amount in bytes - if >= 4GB, returns 4GB. (LSL is not 64-bit aware) 961 /// Amount in bytes - if >= 2GB, returns 2GB. (LSL is not 64-bit aware)
962 /// </summary> 962 /// </summary>
963 /// <returns></returns> 963 /// <returns></returns>
964 public LSL_Integer osGetSimulatorMemory() 964 public LSL_Integer osGetSimulatorMemory()
@@ -966,6 +966,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
966 return m_OSSL_Functions.osGetSimulatorMemory(); 966 return m_OSSL_Functions.osGetSimulatorMemory();
967 } 967 }
968 968
969 public LSL_Integer osGetSimulatorMemoryKB()
970 {
971 return m_OSSL_Functions.osGetSimulatorMemoryKB();
972 }
973
969 public void osKickAvatar(string FirstName,string SurName,string alert) 974 public void osKickAvatar(string FirstName,string SurName,string alert)
970 { 975 {
971 m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert); 976 m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert);