aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorMelanie2011-10-25 02:27:26 +0100
committerMelanie2011-10-25 02:27:26 +0100
commit496c647ab59f47cf51538ec544b8e8c1f94a9cf4 (patch)
tree9272918f5694f62b37c54c0594fbe287371f6b99 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentMerge commit 'ddcb88ff53d2348dfc81451a3ec61bb643c49aff' into bigmerge (diff)
parentImplement osNpcStand(<npc-id>) (diff)
downloadopensim-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/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs5
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 38391df..9e7c8da 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -533,6 +533,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
533 m_OSSL_Functions.osNpcSit(npc, target, options); 533 m_OSSL_Functions.osNpcSit(npc, target, options);
534 } 534 }
535 535
536 public void osNpcStand(LSL_Key npc)
537 {
538 m_OSSL_Functions.osNpcStand(npc);
539 }
540
536 public void osNpcRemove(key npc) 541 public void osNpcRemove(key npc)
537 { 542 {
538 m_OSSL_Functions.osNpcRemove(npc); 543 m_OSSL_Functions.osNpcRemove(npc);