diff options
| author | UbitUmarov | 2016-12-18 05:03:27 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-18 05:03:27 +0000 |
| commit | 82fc8e1a36778a59d4d9c329ea71a60c3f4e8729 (patch) | |
| tree | 65b5fbfe80c9db6547b2693b04544de18647f7bd /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | leave stupid broken permissions alone (diff) | |
| download | opensim-SC-82fc8e1a36778a59d4d9c329ea71a60c3f4e8729.zip opensim-SC-82fc8e1a36778a59d4d9c329ea71a60c3f4e8729.tar.gz opensim-SC-82fc8e1a36778a59d4d9c329ea71a60c3f4e8729.tar.bz2 opensim-SC-82fc8e1a36778a59d4d9c329ea71a60c3f4e8729.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 7 |
1 files changed, 7 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 cf3e6df..7415fea 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -317,6 +317,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 317 | void osForceBreakAllLinks(); | 317 | void osForceBreakAllLinks(); |
| 318 | 318 | ||
| 319 | /// <summary> | 319 | /// <summary> |
| 320 | /// Similar to llDie but given an object UUID | ||
| 321 | /// </summary> | ||
| 322 | /// <param name="objectUUID"></param> | ||
| 323 | |||
| 324 | void osDie(LSL_Key objectUUID); | ||
| 325 | |||
| 326 | /// <summary> | ||
| 320 | /// Check if the given key is an npc | 327 | /// Check if the given key is an npc |
| 321 | /// </summary> | 328 | /// </summary> |
| 322 | /// <param name="npc"></param> | 329 | /// <param name="npc"></param> |