OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into httptests

httptests
UbitUmarov 2017-10-15 23:03:39 +01:00
parent 68e9baf2e0 3d6553afee
commit c220c277e2
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3591,6 +3591,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return (int)pws; return (int)pws;
} }
public int osGetSimulatorMemoryKB()
{
CheckThreatLevel(ThreatLevel.Moderate, "osGetSimulatorMemory");
long pws = System.Diagnostics.Process.GetCurrentProcess().WorkingSet64;
if((pws & 0x3FFL) != 0)
pws += 0x400L;
pws >>= 10;
if (pws > Int32.MaxValue)
return Int32.MaxValue;
return (int)pws;
}
public void osSetSpeed(string UUID, LSL_Float SpeedModifier) public void osSetSpeed(string UUID, LSL_Float SpeedModifier)
{ {
CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed");

1
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@ -379,6 +379,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
vector osGetRegionSize(); vector osGetRegionSize();
int osGetSimulatorMemory(); int osGetSimulatorMemory();
int osGetSimulatorMemoryKB();
void osKickAvatar(string FirstName,string SurName,string alert); void osKickAvatar(string FirstName,string SurName,string alert);
void osSetSpeed(string UUID, LSL_Float SpeedModifier); void osSetSpeed(string UUID, LSL_Float SpeedModifier);
LSL_Float osGetHealth(string avatar); LSL_Float osGetHealth(string avatar);

7
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@ -958,7 +958,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
/// <summary> /// <summary>
/// Returns the amount of memory in use by the Simulator Daemon. /// Returns the amount of memory in use by the Simulator Daemon.
/// Amount in bytes - if >= 4GB, returns 4GB. (LSL is not 64-bit aware) /// Amount in bytes - if >= 2GB, returns 2GB. (LSL is not 64-bit aware)
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public LSL_Integer osGetSimulatorMemory() public LSL_Integer osGetSimulatorMemory()
@ -966,6 +966,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_OSSL_Functions.osGetSimulatorMemory(); return m_OSSL_Functions.osGetSimulatorMemory();
} }
public LSL_Integer osGetSimulatorMemoryKB()
{
return m_OSSL_Functions.osGetSimulatorMemoryKB();
}
public void osKickAvatar(string FirstName,string SurName,string alert) public void osKickAvatar(string FirstName,string SurName,string alert)
{ {
m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert); m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert);