Add osNpcPlayAnimation and osNpcStopAnimation which respect ownership as well

1 files changed, 44 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 120ae2c..fe5f198 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -897,6 +897,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);
@@ -929,6 +934,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);
@@ -2341,6 +2351,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>