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/Interface/IOSSL_Api.cs | |
| 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/Interface/IOSSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 |
1 files changed, 1 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 51d0581..519779e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -337,6 +337,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 337 | key osGetMapTexture(); | 337 | key osGetMapTexture(); |
| 338 | key osGetRegionMapTexture(string regionName); | 338 | key osGetRegionMapTexture(string regionName); |
| 339 | LSL_List osGetRegionStats(); | 339 | LSL_List osGetRegionStats(); |
| 340 | vector osGetRegionSize(); | ||
| 340 | 341 | ||
| 341 | int osGetSimulatorMemory(); | 342 | int osGetSimulatorMemory(); |
| 342 | void osKickAvatar(string FirstName,string SurName,string alert); | 343 | void osKickAvatar(string FirstName,string SurName,string alert); |