aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Interface
diff options
context:
space:
mode:
authorTalun2012-07-03 11:10:09 +0100
committerJustin Clark-Casey (justincc)2012-07-06 22:37:19 +0100
commit1b1f841c6aaf2453b3aca0eade84855ae658e655 (patch)
tree895b5f5bec7f0ae737e74017809e8762c05518b2 /OpenSim/Region/ScriptEngine/Shared/Api/Interface
parentPull prim crossing/teleport checks up into Scene.IncomingCreateObject() from ... (diff)
downloadopensim-SC-1b1f841c6aaf2453b3aca0eade84855ae658e655.zip
opensim-SC-1b1f841c6aaf2453b3aca0eade84855ae658e655.tar.gz
opensim-SC-1b1f841c6aaf2453b3aca0eade84855ae658e655.tar.bz2
opensim-SC-1b1f841c6aaf2453b3aca0eade84855ae658e655.tar.xz
Mantis 6063 osNpcTouch.
Allow NPCS to touch obects.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs1
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 a8335aa..d38709e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -231,6 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
231 void osNpcRemove(key npc); 231 void osNpcRemove(key npc);
232 void osNpcPlayAnimation(LSL_Key npc, string animation); 232 void osNpcPlayAnimation(LSL_Key npc, string animation);
233 void osNpcStopAnimation(LSL_Key npc, string animation); 233 void osNpcStopAnimation(LSL_Key npc, string animation);
234 void osNpcTouch(LSL_Key npcLSL_Key, LSL_Key object_key, LSL_Integer link_num);
234 void osNpcWhisper(key npc, int channel, string message); 235 void osNpcWhisper(key npc, int channel, string message);
235 236
236 LSL_Key osOwnerSaveAppearance(string notecard); 237 LSL_Key osOwnerSaveAppearance(string notecard);