diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 57a995c319..ee18a94d6c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -33,6 +33,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Timers;
+using System.Xml;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using log4net;
@@ -3478,6 +3479,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private void InitDefaultAnimations()
         {
+            using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
+            {
+                XmlDocument doc = new XmlDocument();
+                doc.Load(reader);
+                foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
+                {
+                    if (nod.Attributes["name"] != null)
+                    {
+                        string name = (string)nod.Attributes["name"].Value.ToLower();
+                        string id = (string)nod.InnerText;
+                        m_defaultAnimations.Add(name, id);
+                    }
+                }
+            }
         }
 
         public UUID GetDefaultAnimation(string name)
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 23b66d1e0b..1ec88f8c3f 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2660,9 +2660,6 @@ namespace OpenSim.Region.ScriptEngine.Common
                     animID=InventoryKey(anim);
                 }
 
-                if (animID == UUID.Zero)
-                    return;
-
                 ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter);
 
                 if (presence != null)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7d1f6eae4c..a5eeaad993 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2497,9 +2497,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     animID=InventoryKey(anim);
                 }
 
-                if (animID == UUID.Zero)
-                    return;
-
                 ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter);
 
                 if (presence != null)