1 files changed, 19 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 76d307f..ab19973 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -53,6 +53,8 @@ namespace OpenSim.Region.Environment.Scenes
         private LLVector3 m_requestedSitOffset = new LLVector3();
         private float m_sitAvatarHeight = 2.0f;
 
+        private bool m_isTyping = false;
+
         private Quaternion m_bodyRot;
         private byte[] m_visualParams;
         private AvatarWearable[] m_wearables;
@@ -367,7 +369,6 @@ namespace OpenSim.Region.Environment.Scenes
             AddToPhysicalScene();
             m_physicsActor.Flying = isFlying;
 
-
             m_scene.SendAllSceneObjectsToClient(this);
         }
 
@@ -662,6 +663,10 @@ namespace OpenSim.Region.Environment.Scenes
                     {
                         SendAnimPack(Animations.AnimsLLUUID["CROUCH"], 1);
                     }
+                    else if (m_isTyping)
+                    {
+                        SendAnimPack(Animations.AnimsLLUUID["TYPE"], 1);
+                    }
                     else
                     {
                         SendAnimPack(Animations.AnimsLLUUID["STAND"], 1);
@@ -670,7 +675,6 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-
         protected void AddNewMovement(Vector3 vec, Quaternion rotation)
         {
             if (m_isChildAgent)
@@ -708,6 +712,19 @@ namespace OpenSim.Region.Environment.Scenes
             m_forcesList.Add(newVelocity);
         }
 
+        public void setTyping(bool typing)
+        {
+            if (m_isChildAgent)
+            {
+                MainLog.Instance.Warn("setTyping called on child agent");
+                return;
+            }
+
+            m_isTyping = typing;
+
+            UpdateMovementAnimations(true);
+        }
+
         #endregion
 
         #region Overridden Methods