diff options
| author | Adam Frisby | 2009-12-13 03:04:16 +1100 |
|---|---|---|
| committer | Adam Frisby | 2009-12-13 03:04:16 +1100 |
| commit | 963cf25813ad2bd6dceaa39757391fbf94d6f09e (patch) | |
| tree | 80244f3026d0d1c06f4d8e0b496470052353b083 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | * Bugfix mantis 4441, "Use of Autopilot isn't playing any animations." (diff) | |
| download | opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.zip opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.tar.gz opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.tar.bz2 opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.tar.xz | |
* Implements OSSL function: osGetSimulatorMemory - returns the current amount of memory allocated to the simulator process (Moderate Threat Level).
* Cleans redundant information out of the Simulator Version. Versions now look like:
"OpenSimulator 0.6.9(dev) Unix/Mono"
* [Minor] additional log info for MySQLInventoryData
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 2 |
1 files changed, 2 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 0b0dc00..580c354 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -163,5 +163,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 163 | key osGetMapTexture(); | 163 | key osGetMapTexture(); |
| 164 | key osGetRegionMapTexture(string regionName); | 164 | key osGetRegionMapTexture(string regionName); |
| 165 | LSL_List osGetRegionStats(); | 165 | LSL_List osGetRegionStats(); |
| 166 | |||
| 167 | int osGetSimulatorMemory(); | ||
| 166 | } | 168 | } |
| 167 | } | 169 | } |