1 files changed, 39 insertions, 16 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 00ca070..dbc1dfc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -42,6 +42,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
 {
     public enum ThreatLevel
     {
+        NoAccess = -1,
         None = 0,
         Nuisance = 1,
         VeryLow = 2,
@@ -159,6 +160,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         string osGetGridNick();
         string osGetGridName();
         string osGetGridLoginURI();
+        string osGetGridHomeURI();
+        string osGetGridCustom(string key);
 
         LSL_String osFormatString(string str, LSL_List strings);
         LSL_List osMatchString(string src, string pattern, int start);
@@ -170,22 +173,42 @@ 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);
-        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);
-
-        LSL_Key osOwnerSaveAppearance(string notecard);
-        LSL_Key osAgentSaveAppearance(key agentId, string notecard);
+        /// <summary>
+        /// Check if the given key is an npc
+        /// </summary>
+        /// <param name="npc"></param>
+        /// <returns>TRUE if the key belongs to an npc in the scene.  FALSE otherwise.</returns>
+        LSL_Integer osIsNpc(LSL_Key npc);
+
+        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);