1 files changed, 11 insertions, 7 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index ad1a358..5dbd9ec 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -957,16 +957,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 ScenePresence target = (ScenePresence)World.Entities[avatarID];
                 if (target != null)
                 {
-                    UUID animID = UUID.Zero;
-                    lock (m_host.TaskInventory)
+                    UUID animID = new UUID();
+                    if (!UUID.TryParse(animation, out animID))
                     {
-                        foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                        animID = UUID.Zero;
+                        lock (m_host.TaskInventory)
                         {
-                            if (inv.Value.Name == animation)
+                            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
                             {
-                                if (inv.Value.Type == (int)AssetType.Animation)
-                                    animID = inv.Value.AssetID;
-                                continue;
+                                if (inv.Value.Name == animation)
+                                {
+                                    if (inv.Value.Type == (int)AssetType.Animation)
+                                        animID = inv.Value.AssetID;
+                                    continue;
+                                }
                             }
                         }
                     }