diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 21 |
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 | |||
53 | private LLVector3 m_requestedSitOffset = new LLVector3(); | 53 | private LLVector3 m_requestedSitOffset = new LLVector3(); |
54 | private float m_sitAvatarHeight = 2.0f; | 54 | private float m_sitAvatarHeight = 2.0f; |
55 | 55 | ||
56 | private bool m_isTyping = false; | ||
57 | |||
56 | private Quaternion m_bodyRot; | 58 | private Quaternion m_bodyRot; |
57 | private byte[] m_visualParams; | 59 | private byte[] m_visualParams; |
58 | private AvatarWearable[] m_wearables; | 60 | private AvatarWearable[] m_wearables; |
@@ -367,7 +369,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
367 | AddToPhysicalScene(); | 369 | AddToPhysicalScene(); |
368 | m_physicsActor.Flying = isFlying; | 370 | m_physicsActor.Flying = isFlying; |
369 | 371 | ||
370 | |||
371 | m_scene.SendAllSceneObjectsToClient(this); | 372 | m_scene.SendAllSceneObjectsToClient(this); |
372 | } | 373 | } |
373 | 374 | ||
@@ -662,6 +663,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
662 | { | 663 | { |
663 | SendAnimPack(Animations.AnimsLLUUID["CROUCH"], 1); | 664 | SendAnimPack(Animations.AnimsLLUUID["CROUCH"], 1); |
664 | } | 665 | } |
666 | else if (m_isTyping) | ||
667 | { | ||
668 | SendAnimPack(Animations.AnimsLLUUID["TYPE"], 1); | ||
669 | } | ||
665 | else | 670 | else |
666 | { | 671 | { |
667 | SendAnimPack(Animations.AnimsLLUUID["STAND"], 1); | 672 | SendAnimPack(Animations.AnimsLLUUID["STAND"], 1); |
@@ -670,7 +675,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
670 | } | 675 | } |
671 | } | 676 | } |
672 | 677 | ||
673 | |||
674 | protected void AddNewMovement(Vector3 vec, Quaternion rotation) | 678 | protected void AddNewMovement(Vector3 vec, Quaternion rotation) |
675 | { | 679 | { |
676 | if (m_isChildAgent) | 680 | if (m_isChildAgent) |
@@ -708,6 +712,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
708 | m_forcesList.Add(newVelocity); | 712 | m_forcesList.Add(newVelocity); |
709 | } | 713 | } |
710 | 714 | ||
715 | public void setTyping(bool typing) | ||
716 | { | ||
717 | if (m_isChildAgent) | ||
718 | { | ||
719 | MainLog.Instance.Warn("setTyping called on child agent"); | ||
720 | return; | ||
721 | } | ||
722 | |||
723 | m_isTyping = typing; | ||
724 | |||
725 | UpdateMovementAnimations(true); | ||
726 | } | ||
727 | |||
711 | #endregion | 728 | #endregion |
712 | 729 | ||
713 | #region Overridden Methods | 730 | #region Overridden Methods |