aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-17 01:56:25 +0100
committerJustin Clark-Casey (justincc)2011-10-17 01:56:25 +0100
commitde161585c0960a93911f446f0179441ba5470245 (patch)
treedc32dcc61dabd6f45bc7220bf6f3d89b74268532 /OpenSim/Region/ScriptEngine/Shared
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-de161585c0960a93911f446f0179441ba5470245.zip
opensim-SC-de161585c0960a93911f446f0179441ba5470245.tar.gz
opensim-SC-de161585c0960a93911f446f0179441ba5470245.tar.bz2
opensim-SC-de161585c0960a93911f446f0179441ba5470245.tar.xz
Implement osNpcStand(<npc-id>)
Allows you to stand an NPC that has sat.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs11
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs5
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 7cf6642..49c8722 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2362,6 +2362,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2362 } 2362 }
2363 } 2363 }
2364 2364
2365 public void osNpcStand(LSL_Key npc)
2366 {
2367 CheckThreatLevel(ThreatLevel.High, "osNpcStand");
2368
2369 INPCModule module = World.RequestModuleInterface<INPCModule>();
2370 if (module != null)
2371 {
2372 module.Stand(new UUID(npc.m_string), World);
2373 }
2374 }
2375
2365 public void osNpcRemove(LSL_Key npc) 2376 public void osNpcRemove(LSL_Key npc)
2366 { 2377 {
2367 CheckThreatLevel(ThreatLevel.High, "osNpcRemove"); 2378 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 bb0a870..3221833 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);