2 files changed, 22 insertions, 6 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index f6cc7f0..32e9085 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -5698,11 +5698,19 @@ namespace OpenSim.Region.ScriptEngine.Common
             return (double)Math.Log(val);
         }
 
-        public LSL_Types.list llGetAnimationList(string id)
+        public LSL_Types.list llGetAnimationList( string id )
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llGetAnimationList");
-            return new LSL_Types.list();
+            
+            LSL_Types.list l = new LSL_Types.list();
+            ScenePresence av = World.GetScenePresence(id);
+            if( av == null )
+                return l;
+            LLUUID[] anims;
+            anims = av.GetAnimationArray();
+            foreach( LLUUID foo in anims )
+                l.Add( foo.ToString() );
+            return l;
         }
 
         public void llSetParcelMusicURL(string url)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 09377a1..15793e4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5502,11 +5502,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return (double)Math.Log(val);
         }
 
-        public LSL_Types.list llGetAnimationList(string id)
+        public LSL_Types.list llGetAnimationList( string id )
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llGetAnimationList");
-            return new LSL_Types.list();
+            
+            LSL_Types.list l = new LSL_Types.list();
+            ScenePresence av = World.GetScenePresence(id);
+            if( av == null )
+                return l;
+            LLUUID[] anims;
+            anims = av.GetAnimationArray();
+            foreach( LLUUID foo in anims )
+                l.Add( foo.ToString() );
+            return l;
         }
 
         public void llSetParcelMusicURL(string url)