aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs11
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
2 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index a2805d2..cac936c 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
59 get { return m_movementAnimation; } 59 get { return m_movementAnimation; }
60 } 60 }
61 protected string m_movementAnimation = "CROUCH"; 61 protected string m_movementAnimation = "CROUCH";
62
62 private int m_animTickFall; 63 private int m_animTickFall;
63 public int m_animTickJump; // ScenePresence has to see this to control +Z force 64 public int m_animTickJump; // ScenePresence has to see this to control +Z force
64 public bool m_jumping = false; 65 public bool m_jumping = false;
@@ -146,6 +147,10 @@ namespace OpenSim.Region.Framework.Scenes.Animation
146 { 147 {
147 if (!m_scenePresence.IsChildAgent) 148 if (!m_scenePresence.IsChildAgent)
148 { 149 {
150// m_log.DebugFormat(
151// "[SCENE PRESENCE ANIMATOR]: Setting movement animation {0} for {1}",
152// anim, m_scenePresence.Name);
153
149 if (m_animations.TrySetDefaultAnimation( 154 if (m_animations.TrySetDefaultAnimation(
150 anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID)) 155 anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID))
151 { 156 {
@@ -169,7 +174,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
169 /// <summary> 174 /// <summary>
170 /// This method determines the proper movement related animation 175 /// This method determines the proper movement related animation
171 /// </summary> 176 /// </summary>
172 public string GetMovementAnimation() 177 public string DetermineMovementAnimation()
173 { 178 {
174 const float FALL_DELAY = 800f; 179 const float FALL_DELAY = 800f;
175 const float PREJUMP_DELAY = 200f; 180 const float PREJUMP_DELAY = 200f;
@@ -283,7 +288,6 @@ namespace OpenSim.Region.Framework.Scenes.Animation
283 int jumptime; 288 int jumptime;
284 jumptime = Environment.TickCount - m_animTickJump; 289 jumptime = Environment.TickCount - m_animTickJump;
285 290
286
287 if ((move.Z > 0f) && (!m_jumping)) 291 if ((move.Z > 0f) && (!m_jumping))
288 { 292 {
289 // Start jumping, prejump 293 // Start jumping, prejump
@@ -387,6 +391,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
387 #endregion Ground Movement 391 #endregion Ground Movement
388 392
389 m_falling = false; 393 m_falling = false;
394
390 return m_movementAnimation; 395 return m_movementAnimation;
391 } 396 }
392 397
@@ -395,7 +400,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
395 /// </summary> 400 /// </summary>
396 public void UpdateMovementAnimations() 401 public void UpdateMovementAnimations()
397 { 402 {
398 m_movementAnimation = GetMovementAnimation(); 403 m_movementAnimation = DetermineMovementAnimation();
399 TrySetMovementAnimation(m_movementAnimation); 404 TrySetMovementAnimation(m_movementAnimation);
400 } 405 }
401 406
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6c54c9b..2812683 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5554,7 +5554,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5554 flags |= ScriptBaseClass.AGENT_TYPING; 5554 flags |= ScriptBaseClass.AGENT_TYPING;
5555 } 5555 }
5556 5556
5557 string agentMovementAnimation = agent.Animator.GetMovementAnimation(); 5557 string agentMovementAnimation = agent.Animator.DetermineMovementAnimation();
5558 5558
5559 if (agentMovementAnimation == "CROUCH") 5559 if (agentMovementAnimation == "CROUCH")
5560 { 5560 {