diff options
| author | Justin Clark-Casey (justincc) | 2014-01-28 00:23:10 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-01-28 00:23:10 +0000 |
| commit | cd35d298faa06382e87297d464badd5a1cf231af (patch) | |
| tree | c9657bc670440c45386d6b3f9631e5dcaedad33b /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Reinsert attachments list taking code in SP.MakeRootAgent() (diff) | |
| parent | Added osGetRegionSize(), which returns the region size in meters and recogniz... (diff) | |
| download | opensim-SC-cd35d298faa06382e87297d464badd5a1cf231af.zip opensim-SC-cd35d298faa06382e87297d464badd5a1cf231af.tar.gz opensim-SC-cd35d298faa06382e87297d464badd5a1cf231af.tar.bz2 opensim-SC-cd35d298faa06382e87297d464badd5a1cf231af.tar.xz | |
Merge branch 'justincc-master'
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 c9902e4..02a3541 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
| @@ -863,6 +863,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 863 | return m_OSSL_Functions.osGetRegionStats(); | 863 | return m_OSSL_Functions.osGetRegionStats(); |
| 864 | } | 864 | } |
| 865 | 865 | ||
| 866 | public vector osGetRegionSize() | ||
| 867 | { | ||
| 868 | return m_OSSL_Functions.osGetRegionSize(); | ||
| 869 | } | ||
| 870 | |||
| 866 | /// <summary> | 871 | /// <summary> |
| 867 | /// Returns the amount of memory in use by the Simulator Daemon. | 872 | /// Returns the amount of memory in use by the Simulator Daemon. |
| 868 | /// Amount in bytes - if >= 4GB, returns 4GB. (LSL is not 64-bit aware) | 873 | /// Amount in bytes - if >= 4GB, returns 4GB. (LSL is not 64-bit aware) |