From 9939f94f08b33e3dd9eeea65b730f0ddc80275a5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 Jan 2012 23:05:48 +0000
Subject: Implement osNpcGetOwner(key npc):key.  This returns the owner for an
 'owned' NPC, the npc's own key for an 'unowned' NPC and NULL_KEY is the input
 key was not an npc.

llGetOwnerKey() could also be extended but this does not allow one to distinguish between an unowned NPC and some other result (e.g. 'no such object' if NULL_KEY is the return.
Also, any future extensions to LSL functions by Linden Lab are unpredictable and OpenSim-specific extensions could clash.
---
 .../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 48 +++++++++++++---------
 1 file changed, 29 insertions(+), 19 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 0f8cbdc..ee48ec4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -173,25 +173,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
 
         LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules);
 
-        key osNpcCreate(string user, string name, vector position, string notecard);
-        key osNpcCreate(string user, string name, vector position, string notecard, int options);
-        LSL_Key osNpcSaveAppearance(key npc, string notecard);
-        void osNpcLoadAppearance(key npc, string notecard);
-        vector osNpcGetPos(key npc);
-        void osNpcMoveTo(key npc, vector position);
-        void osNpcMoveToTarget(key npc, vector target, int options);
-        rotation osNpcGetRot(key npc);
-        void osNpcSetRot(LSL_Key npc, rotation rot);
-        void osNpcStopMoveToTarget(LSL_Key npc);
-        void osNpcSay(key npc, string message);
-        void osNpcSit(key npc, key target, int options);
-        void osNpcStand(LSL_Key npc);
-        void osNpcRemove(key npc);
-        void osNpcPlayAnimation(LSL_Key npc, string animation);
-        void osNpcStopAnimation(LSL_Key npc, string animation);
-
-        LSL_Key osOwnerSaveAppearance(string notecard);
-        LSL_Key osAgentSaveAppearance(key agentId, string notecard);
+        key         osNpcCreate(string user, string name, vector position, string notecard);
+        key         osNpcCreate(string user, string name, vector position, string notecard, int options);
+        LSL_Key     osNpcSaveAppearance(key npc, string notecard);
+        void        osNpcLoadAppearance(key npc, string notecard);
+        vector      osNpcGetPos(key npc);
+        void        osNpcMoveTo(key npc, vector position);
+        void        osNpcMoveToTarget(key npc, vector target, int options);
+
+        /// <summary>
+        /// Get the owner of the NPC
+        /// </summary>
+        /// <param name="npc"></param>
+        /// <returns>
+        /// The owner of the NPC for an owned NPC.  The NPC's agent id for an unowned NPC.  UUID.Zero if the key is not an npc.
+        /// </returns>
+        LSL_Key     osNpcGetOwner(key npc);
+
+        rotation    osNpcGetRot(key npc);
+        void        osNpcSetRot(LSL_Key npc, rotation rot);
+        void        osNpcStopMoveToTarget(LSL_Key npc);
+        void        osNpcSay(key npc, string message);
+        void        osNpcSit(key npc, key target, int options);
+        void        osNpcStand(LSL_Key npc);
+        void        osNpcRemove(key npc);
+        void        osNpcPlayAnimation(LSL_Key npc, string animation);
+        void        osNpcStopAnimation(LSL_Key npc, string animation);
+
+        LSL_Key     osOwnerSaveAppearance(string notecard);
+        LSL_Key     osAgentSaveAppearance(key agentId, string notecard);
 
         key osGetMapTexture();
         key osGetRegionMapTexture(string regionName);
-- 
cgit v1.1