diff options
| author | Melanie | 2009-12-14 00:40:56 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-14 00:40:56 +0000 |
| commit | 824d7190c2a5520f1cf6f3d24585b8c47c841e55 (patch) | |
| tree | 0814d0228121249b7f2a33658180a0a446d13f51 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | And reverse (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-824d7190c2a5520f1cf6f3d24585b8c47c841e55.zip opensim-SC-824d7190c2a5520f1cf6f3d24585b8c47c841e55.tar.gz opensim-SC-824d7190c2a5520f1cf6f3d24585b8c47c841e55.tar.bz2 opensim-SC-824d7190c2a5520f1cf6f3d24585b8c47c841e55.tar.xz | |
Merge branch 'master' into careminster
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 c3bf7d2..d943b59 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 | } |