3 files changed, 56 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 c1a700a..efb77ae 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -888,6 +888,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             CheckThreatLevel(ThreatLevel.VeryHigh, "osAvatarPlayAnimation");
 
+            AvatarPlayAnimation(avatar, animation);
+        }
+
+        private void AvatarPlayAnimation(string avatar, string animation)
+        {
             UUID avatarID = (UUID)avatar;
 
             m_host.AddScriptLPS(1);
@@ -921,6 +926,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             CheckThreatLevel(ThreatLevel.VeryHigh, "osAvatarStopAnimation");
 
+            AvatarStopAnimation(avatar, animation);
+        }
+
+        private void AvatarStopAnimation(string avatar, string animation)
+        {
             UUID avatarID = (UUID)avatar;
 
             m_host.AddScriptLPS(1);
@@ -2332,6 +2342,40 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
+        public void osNpcPlayAnimation(LSL_Key npc, string animation)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osPlayAnimation");
+
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if (module != null)
+            {
+                UUID npcID = new UUID(npc.m_string);
+                if (module.IsNPC(npcID))
+                {
+                    UUID ownerID = module.GetOwner(npcID);
+                    if (ownerID == UUID.Zero || ownerID == m_host.OwnerID)
+                        AvatarPlayAnimation(npcID.ToString(), animation);
+                }
+            }
+        }
+
+        public void osNpcStopAnimation(LSL_Key npc, string animation)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcStopAnimation");
+
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if (module != null)
+            {
+                UUID npcID = new UUID(npc.m_string);
+                if (module.IsNPC(npcID))
+                {
+                    UUID ownerID = module.GetOwner(npcID);
+                    if (ownerID == UUID.Zero || ownerID == m_host.OwnerID)
+                        AvatarStopAnimation(npcID.ToString(), animation);
+                }
+            }
+        }
+
         /// <summary>
         /// Save the current appearance of the script owner permanently to the named notecard.
         /// </summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 1380ed4..d5e085d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -185,6 +185,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void osNpcSit(key npc, key target, int options);
         void osNpcStand(LSL_Key npc);
         void osNpcRemove(key npc);
+        public void osNpcPlayAnimation(LSL_Key npc, string animation);
+        public void osNpcStopAnimation(LSL_Key npc, string animation);
 
         LSL_Key osOwnerSaveAppearance(string notecard);
         LSL_Key osAgentSaveAppearance(key agentId, 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 6572def..a94392a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -553,6 +553,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_OSSL_Functions.osNpcRemove(npc);
         }
 
+        public void osNpcPlayAnimation(LSL_Key npc, string animation)
+        {
+            m_OSSL_Functions.osNpcPlayAnimation(npc, animation);
+        }
+
+        public void osNpcStopAnimation(LSL_Key npc, string animation)
+        {
+            m_OSSL_Functions.osNpcStopAnimation(npc, animation);
+        }
+
         public LSL_Key osOwnerSaveAppearance(string notecard)
         {
             return m_OSSL_Functions.osOwnerSaveAppearance(notecard);