diff options
| author | UbitUmarov | 2019-11-20 23:16:20 +0000 |
|---|---|---|
| committer | UbitUmarov | 2019-11-20 23:16:20 +0000 |
| commit | bd12d60e80b6f051a9e4f4470c7621e5ad098380 (patch) | |
| tree | ba511769ca0ea52e114168920c5773a9872955c4 /OpenSim/Region/ScriptEngine/Shared/Api | |
| parent | fix the block of teleport to same region handle (diff) | |
| download | opensim-SC-bd12d60e80b6f051a9e4f4470c7621e5ad098380.zip opensim-SC-bd12d60e80b6f051a9e4f4470c7621e5ad098380.tar.gz opensim-SC-bd12d60e80b6f051a9e4f4470c7621e5ad098380.tar.bz2 opensim-SC-bd12d60e80b6f051a9e4f4470c7621e5ad098380.tar.xz | |
cosmetics
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 3cb0fe7..eb7049e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -3689,7 +3689,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3689 | { | 3689 | { |
| 3690 | CheckThreatLevel(ThreatLevel.Moderate, "osGetSimulatorMemory"); | 3690 | CheckThreatLevel(ThreatLevel.Moderate, "osGetSimulatorMemory"); |
| 3691 | 3691 | ||
| 3692 | long pws = System.Diagnostics.Process.GetCurrentProcess().WorkingSet64; | 3692 | long pws = Util.GetPhysicalMemUse(); |
| 3693 | 3693 | ||
| 3694 | if (pws > Int32.MaxValue) | 3694 | if (pws > Int32.MaxValue) |
| 3695 | return Int32.MaxValue; | 3695 | return Int32.MaxValue; |
| @@ -3703,9 +3703,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3703 | { | 3703 | { |
| 3704 | CheckThreatLevel(ThreatLevel.Moderate, "osGetSimulatorMemoryKB"); | 3704 | CheckThreatLevel(ThreatLevel.Moderate, "osGetSimulatorMemoryKB"); |
| 3705 | 3705 | ||
| 3706 | long pws = System.Diagnostics.Process.GetCurrentProcess().WorkingSet64; | 3706 | long pws = Util.GetPhysicalMemUse(); |
| 3707 | 3707 | ||
| 3708 | if((pws & 0x3FFL) != 0) | 3708 | if ((pws & 0x3FFL) != 0) |
| 3709 | pws += 0x400L; | 3709 | pws += 0x400L; |
| 3710 | pws >>= 10; | 3710 | pws >>= 10; |
| 3711 | 3711 | ||