1 files changed, 11 insertions, 8 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 87c0450..bac8f2a 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2136,15 +2136,15 @@ namespace OpenSim.Region.ScriptEngine.Common
 
             if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION) != 0)
             {
-                // Do NOT try to parse LLUUID, animations cannot be triggered by ID
-                LLUUID animID=InventoryKey(anim, (int)AssetType.Animation);
-                if (animID == LLUUID.Zero)
-                    return;
-
                 if (World.m_innerScene.ScenePresences.ContainsKey(m_host.TaskInventory[invItemID].PermsGranter))
                 {
                     ScenePresence presence = World.m_innerScene.ScenePresences[m_host.TaskInventory[invItemID].PermsGranter];
-                    presence.AddAnimation(animID);
+                                        // Do NOT try to parse LLUUID, animations cannot be triggered by ID
+                                        LLUUID animID=InventoryKey(anim, (int)AssetType.Animation);
+                                        if (animID == LLUUID.Zero)
+                                                presence.AddAnimation(anim);
+                                        else
+                                                presence.AddAnimation(animID);
                 }
             }
         }
@@ -2170,12 +2170,15 @@ namespace OpenSim.Region.ScriptEngine.Common
                 }
 
                 if (animID == LLUUID.Zero)
-                    return;
+                                        return;
 
                 if (World.m_innerScene.ScenePresences.ContainsKey(m_host.TaskInventory[invItemID].PermsGranter))
                 {
                     ScenePresence presence = World.m_innerScene.ScenePresences[m_host.TaskInventory[invItemID].PermsGranter];
-                    presence.RemoveAnimation(animID);
+                                        if (animID == LLUUID.Zero)
+                                                presence.RemoveAnimation(anim);
+                                        else
+                                                presence.RemoveAnimation(animID);
                 }
             }
         }