diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index 9c103cb..4925175 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
@@ -27,6 +27,8 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
31 | using log4net; | ||
30 | using OpenMetaverse; | 32 | using OpenMetaverse; |
31 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
32 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
@@ -40,6 +42,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
40 | /// </summary> | 42 | /// </summary> |
41 | public class ScenePresenceAnimator | 43 | public class ScenePresenceAnimator |
42 | { | 44 | { |
45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
46 | |||
43 | public AnimationSet Animations | 47 | public AnimationSet Animations |
44 | { | 48 | { |
45 | get { return m_animations; } | 49 | get { return m_animations; } |
@@ -79,6 +83,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
79 | if (m_scenePresence.IsChildAgent) | 83 | if (m_scenePresence.IsChildAgent) |
80 | return; | 84 | return; |
81 | 85 | ||
86 | // m_log.DebugFormat("[SCENE PRESENCE ANIMATOR]: Adding animation {0} for {1}", animID, m_scenePresence.Name); | ||
87 | |||
82 | if (m_animations.Add(animID, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, objectID)) | 88 | if (m_animations.Add(animID, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, objectID)) |
83 | SendAnimPack(); | 89 | SendAnimPack(); |
84 | } | 90 | } |
@@ -93,6 +99,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
93 | if (animID == UUID.Zero) | 99 | if (animID == UUID.Zero) |
94 | return; | 100 | return; |
95 | 101 | ||
102 | // m_log.DebugFormat("[SCENE PRESENCE ANIMATOR]: Adding animation {0} {1} for {2}", animID, name, m_scenePresence.Name); | ||
103 | |||
96 | AddAnimation(animID, objectID); | 104 | AddAnimation(animID, objectID); |
97 | } | 105 | } |
98 | 106 | ||
@@ -136,6 +144,10 @@ TrySetMovementAnimation("STAND"); | |||
136 | if (m_animations.TrySetDefaultAnimation( | 144 | if (m_animations.TrySetDefaultAnimation( |
137 | anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID)) | 145 | anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID)) |
138 | { | 146 | { |
147 | // m_log.DebugFormat( | ||
148 | // "[SCENE PRESENCE ANIMATOR]: Updating movement animation to {0} for {1}", | ||
149 | // anim, m_scenePresence.Name); | ||
150 | |||
139 | // 16384 is CHANGED_ANIMATION | 151 | // 16384 is CHANGED_ANIMATION |
140 | m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { (int)Changed.ANIMATION}); | 152 | m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { (int)Changed.ANIMATION}); |
141 | SendAnimPack(); | 153 | SendAnimPack(); |
@@ -353,7 +365,7 @@ TrySetMovementAnimation("STAND"); | |||
353 | /* This section removed, replaced by jumping section | 365 | /* This section removed, replaced by jumping section |
354 | m_animTickFall = 0; | 366 | m_animTickFall = 0; |
355 | 367 | ||
356 | if (move.Z > 0f) | 368 | if (move.Z > 0.2f) |
357 | { | 369 | { |
358 | // Jumping | 370 | // Jumping |
359 | if (!jumping) | 371 | if (!jumping) |