diff options
| author | Melanie | 2011-10-25 02:27:26 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 02:27:26 +0100 |
| commit | 496c647ab59f47cf51538ec544b8e8c1f94a9cf4 (patch) | |
| tree | 9272918f5694f62b37c54c0594fbe287371f6b99 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Merge commit 'ddcb88ff53d2348dfc81451a3ec61bb643c49aff' into bigmerge (diff) | |
| parent | Implement osNpcStand(<npc-id>) (diff) | |
| download | opensim-SC-496c647ab59f47cf51538ec544b8e8c1f94a9cf4.zip opensim-SC-496c647ab59f47cf51538ec544b8e8c1f94a9cf4.tar.gz opensim-SC-496c647ab59f47cf51538ec544b8e8c1f94a9cf4.tar.bz2 opensim-SC-496c647ab59f47cf51538ec544b8e8c1f94a9cf4.tar.xz | |
Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
| -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 8fe43dd..a61d553 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -179,6 +179,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 179 | void osNpcStopMoveToTarget(LSL_Key npc); | 179 | void osNpcStopMoveToTarget(LSL_Key npc); |
| 180 | void osNpcSay(key npc, string message); | 180 | void osNpcSay(key npc, string message); |
| 181 | void osNpcSit(key npc, key target, int options); | 181 | void osNpcSit(key npc, key target, int options); |
| 182 | void osNpcStand(LSL_Key npc); | ||
| 182 | void osNpcRemove(key npc); | 183 | void osNpcRemove(key npc); |
| 183 | 184 | ||
| 184 | LSL_Key osOwnerSaveAppearance(string notecard); | 185 | LSL_Key osOwnerSaveAppearance(string notecard); |