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 | |
parent | Merge commit 'ddcb88ff53d2348dfc81451a3ec61bb643c49aff' into bigmerge (diff) | |
parent | Implement osNpcStand(<npc-id>) (diff) | |
download | opensim-SC_OLD-496c647ab59f47cf51538ec544b8e8c1f94a9cf4.zip opensim-SC_OLD-496c647ab59f47cf51538ec544b8e8c1f94a9cf4.tar.gz opensim-SC_OLD-496c647ab59f47cf51538ec544b8e8c1f94a9cf4.tar.bz2 opensim-SC_OLD-496c647ab59f47cf51538ec544b8e8c1f94a9cf4.tar.xz |
Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
3 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index bfe62c7..bcbb8ef 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2370,6 +2370,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2370 | } | 2370 | } |
2371 | } | 2371 | } |
2372 | 2372 | ||
2373 | public void osNpcStand(LSL_Key npc) | ||
2374 | { | ||
2375 | CheckThreatLevel(ThreatLevel.High, "osNpcStand"); | ||
2376 | |||
2377 | INPCModule module = World.RequestModuleInterface<INPCModule>(); | ||
2378 | if (module != null) | ||
2379 | { | ||
2380 | module.Stand(new UUID(npc.m_string), World); | ||
2381 | } | ||
2382 | } | ||
2383 | |||
2373 | public void osNpcRemove(LSL_Key npc) | 2384 | public void osNpcRemove(LSL_Key npc) |
2374 | { | 2385 | { |
2375 | CheckThreatLevel(ThreatLevel.High, "osNpcRemove"); | 2386 | CheckThreatLevel(ThreatLevel.High, "osNpcRemove"); |
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); |
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); |