diff options
| author | UbitUmarov | 2017-10-15 14:46:21 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-10-15 14:46:21 +0100 |
| commit | 3d6553afeee3d4605851b6f336c17d5a6b07c6ad (patch) | |
| tree | 37004036b982eff88882f131ff74017e85601955 /OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (Ubit beat (diff) | |
| download | opensim-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/Interface/IOSSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 429860b..ffb7ded 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -379,6 +379,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 379 | vector osGetRegionSize(); | 379 | vector osGetRegionSize(); |
| 380 | 380 | ||
| 381 | int osGetSimulatorMemory(); | 381 | int osGetSimulatorMemory(); |
| 382 | int osGetSimulatorMemoryKB(); | ||
| 382 | void osKickAvatar(string FirstName,string SurName,string alert); | 383 | void osKickAvatar(string FirstName,string SurName,string alert); |
| 383 | void osSetSpeed(string UUID, LSL_Float SpeedModifier); | 384 | void osSetSpeed(string UUID, LSL_Float SpeedModifier); |
| 384 | LSL_Float osGetHealth(string avatar); | 385 | LSL_Float osGetHealth(string avatar); |