diff options
| author | Robert Adams | 2014-01-28 08:50:28 -0800 |
|---|---|---|
| committer | Robert Adams | 2014-01-28 08:50:28 -0800 |
| commit | 8eec717f5f0f34354a73dcfeecdd3e9514d5e435 (patch) | |
| tree | fec59ef61f8782d21641a3a16080493d20a420b1 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | varregion: fix for teleporting by double clicking on a map location. (diff) | |
| parent | Merge branch 'justincc-master' (diff) | |
| download | opensim-SC_OLD-8eec717f5f0f34354a73dcfeecdd3e9514d5e435.zip opensim-SC_OLD-8eec717f5f0f34354a73dcfeecdd3e9514d5e435.tar.gz opensim-SC_OLD-8eec717f5f0f34354a73dcfeecdd3e9514d5e435.tar.bz2 opensim-SC_OLD-8eec717f5f0f34354a73dcfeecdd3e9514d5e435.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index d81cddc..9c060e5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
| @@ -865,6 +865,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 865 | return m_OSSL_Functions.osGetRegionStats(); | 865 | return m_OSSL_Functions.osGetRegionStats(); |
| 866 | } | 866 | } |
| 867 | 867 | ||
| 868 | public vector osGetRegionSize() | ||
| 869 | { | ||
| 870 | return m_OSSL_Functions.osGetRegionSize(); | ||
| 871 | } | ||
| 872 | |||
| 868 | /// <summary> | 873 | /// <summary> |
| 869 | /// Returns the amount of memory in use by the Simulator Daemon. | 874 | /// Returns the amount of memory in use by the Simulator Daemon. |
| 870 | /// Amount in bytes - if >= 4GB, returns 4GB. (LSL is not 64-bit aware) | 875 | /// Amount in bytes - if >= 4GB, returns 4GB. (LSL is not 64-bit aware) |