diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 7042f40964..7bc8d14a30 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -147,6 +147,7 @@ namespace OpenSim.Framework.Interfaces
 
         void OutPacket(Packet newPack);
         void SendWearables(AvatarWearable[] wearables);
+        void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId);
         void SendRegionHandshake(RegionInfo regionInfo);
         void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
         void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 5866b451fe..48d5b9dee8 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -528,6 +528,21 @@ namespace OpenSim.Region.ClientStack
             OutPacket(avp);
         }
 
+	public void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId)
+	{
+	    AvatarAnimationPacket ani = new AvatarAnimationPacket();
+	    ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[1];
+	    ani.AnimationSourceList[0] = new AvatarAnimationPacket.AnimationSourceListBlock();
+	    ani.AnimationSourceList[0].ObjectID = sourceAgentId;
+	    ani.Sender = new AvatarAnimationPacket.SenderBlock();
+	    ani.Sender.ID = sourceAgentId;
+	    ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[1];
+	    ani.AnimationList[0] = new AvatarAnimationPacket.AnimationListBlock();
+	    ani.AnimationList[0].AnimID = animID;
+	    ani.AnimationList[0].AnimSequenceID = seq;
+	    this.OutPacket(ani);
+	}
+
         #endregion
 
         #region Avatar Packet/data sending Methods
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index d335699986..b0e7710d62 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -122,6 +122,8 @@ namespace OpenSim.Region.Environment.Scenes
             }
 
             Wearables = AvatarWearable.DefaultWearables;
+            Animations = new ScenePresence.AvatarAnimations();
+            Animations.LoadAnims();
             
             this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
 
@@ -274,9 +276,27 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 this.AddNewMovement(agent_control_v3, q);
             }
-
+	    UpdateMovementAnimations(update_movementflag);
         }
 
+	protected void UpdateMovementAnimations(bool update_movementflag)
+	{
+	    if (update_movementflag)
+	    {
+	        if (movementflag != 0) {
+		    if (this._physActor.Flying) {
+		    	this.SendAnimPack(Animations.AnimsLLUUID["FLY"], 1);
+		    } else {
+		        this.SendAnimPack(Animations.AnimsLLUUID["WALK"], 1);
+		    }
+		} else {
+		    this.SendAnimPack(Animations.AnimsLLUUID["STAND"], 1);
+		}
+	    }
+	
+	}
+
+
         protected void AddNewMovement(Vector3 vec, Quaternion rotation)
         {
             NewForce newVelocity = new NewForce();
@@ -403,8 +423,13 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="seq"></param>
         public void SendAnimPack(LLUUID animID, int seq)
         {
-
-
+	    this.current_anim = animID;
+	    this.anim_seq = anim_seq;
+	    List<ScenePresence> avatars = this.m_world.RequestAvatarList();
+	    for (int i = 0; i < avatars.Count; i++)
+	    {
+	    	avatars[i].ControllingClient.SendAnimation(animID, seq, this.ControllingClient.AgentId);
+	    }
         }
 
         /// <summary>
@@ -412,7 +437,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void SendAnimPack()
         {
-
+	    this.SendAnimPack(this.current_anim, this.anim_seq);
         }
         #endregion
 
diff --git a/bin/data/LICENSE-README-IMPORTANT.txt b/bin/data/LICENSE-README-IMPORTANT.txt
new file mode 100644
index 0000000000..322910263e
--- /dev/null
+++ b/bin/data/LICENSE-README-IMPORTANT.txt
@@ -0,0 +1,5 @@
+Not all of the files in this directory are licensed under the BSD license. Some of these files come with the Second Life viewer and are considered licensed under a Creative Commons License.
+
+These files are:
+
+- avataranimations.xml (Derivative work of viewerart.ini, Creative Commons Attribution+Share-Alike v2.5 License)
\ No newline at end of file
diff --git a/bin/data/avataranimations.xml b/bin/data/avataranimations.xml
new file mode 100644
index 0000000000..461613f727
--- /dev/null
+++ b/bin/data/avataranimations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Copyright(C) 2002-2007 Linden Lab, OpenSim Developers -->
+<!-- Based on viewerart.ini packaged with the viewer. -->
+<!-- This file is a derivative work of the above while it contains default animation UUIDs -->
+<!-- Licensed under a creative commons license (By-SA) http://creativecommons.org/licenses/by-sa/2.5/ -->
+<animations>
+	<animation name="STAND">2408fe9e-df1d-1d7d-f4ff-1384fa7b350f</animation>
+	<animation name="WALK">6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0</animation>
+	<animation name="FLY">aec4610c-757f-bc4e-c092-c6e9caf18daf</animation>
+</animations>
\ No newline at end of file