ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2019-11-20 23:16:20 +00:00
parent 0cf3ec553a
commit bd12d60e80
5 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@@ -684,7 +684,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if(destinationHandle == sourceRegion.RegionHandle)
{
sp.ControllingClient.SendTeleportFailed("Can't teleport to a region on same map position. Try going other region first, then retry");
sp.ControllingClient.SendTeleportFailed("Can't teleport to a region on same map position. Try going to another region first, then retry from there");
return;
}

6
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -3689,7 +3689,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
CheckThreatLevel(ThreatLevel.Moderate, "osGetSimulatorMemory");
long pws = System.Diagnostics.Process.GetCurrentProcess().WorkingSet64;
long pws = Util.GetPhysicalMemUse();
if (pws > Int32.MaxValue)
return Int32.MaxValue;
@@ -3703,9 +3703,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
CheckThreatLevel(ThreatLevel.Moderate, "osGetSimulatorMemoryKB");
long pws = System.Diagnostics.Process.GetCurrentProcess().WorkingSet64;
long pws = Util.GetPhysicalMemUse();
if((pws & 0x3FFL) != 0)
if ((pws & 0x3FFL) != 0)
pws += 0x400L;
pws >>= 10;