aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Animation
diff options
context:
space:
mode:
authorKittoFlora2009-11-25 08:03:09 +0100
committerKittoFlora2009-11-25 08:03:09 +0100
commit32c464ad1f43cbee9492108c1bec7f874a20cd47 (patch)
treedd224e11c97317403f04b6747c87b2682c1bab75 /OpenSim/Region/Framework/Scenes/Animation
parentMerge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into caremin... (diff)
downloadopensim-SC_OLD-32c464ad1f43cbee9492108c1bec7f874a20cd47.zip
opensim-SC_OLD-32c464ad1f43cbee9492108c1bec7f874a20cd47.tar.gz
opensim-SC_OLD-32c464ad1f43cbee9492108c1bec7f874a20cd47.tar.bz2
opensim-SC_OLD-32c464ad1f43cbee9492108c1bec7f874a20cd47.tar.xz
Fixed animation sequencing: SitHere, Falling, Stand/Walk etc. Login Init
Av Animation at Stand.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs15
1 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 30a95ce..2d41342 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
53 { 53 {
54 get { return m_movementAnimation; } 54 get { return m_movementAnimation; }
55 } 55 }
56 protected string m_movementAnimation = "DEFAULT"; 56 // protected string m_movementAnimation = "DEFAULT"; //KF: 'DEFAULT' does not exist!
57 57 protected string m_movementAnimation = "CROUCH"; //KF: CROUCH ensures reliable Av Anim. init.
58 private int m_animTickFall; 58 private int m_animTickFall;
59 private int m_animTickJump; 59 private int m_animTickJump;
60 60
@@ -123,17 +123,22 @@ namespace OpenSim.Region.Framework.Scenes.Animation
123 /// </summary> 123 /// </summary>
124 public void TrySetMovementAnimation(string anim) 124 public void TrySetMovementAnimation(string anim)
125 { 125 {
126 //m_log.DebugFormat("Updating movement animation to {0}", anim); 126//Console.WriteLine("Updating movement animation to {0}", anim);
127 127
128 if (!m_scenePresence.IsChildAgent) 128 if (!m_scenePresence.IsChildAgent)
129 { 129 {
130 if (m_animations.TrySetDefaultAnimation( 130 if (m_animations.TrySetDefaultAnimation(
131 anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, UUID.Zero)) 131 anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, UUID.Zero))
132 { 132 {
133//Console.WriteLine("TSMA {0} success.", anim);
133 // 16384 is CHANGED_ANIMATION 134 // 16384 is CHANGED_ANIMATION
134 m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { 16384 }); 135 m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { 16384 });
135 SendAnimPack(); 136 SendAnimPack();
136 } 137 }
138 else
139 {
140//Console.WriteLine("TSMA {0} fail.", anim);
141 }
137 } 142 }
138 } 143 }
139 144
@@ -313,7 +318,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
313 public void UpdateMovementAnimations() 318 public void UpdateMovementAnimations()
314 { 319 {
315 m_movementAnimation = GetMovementAnimation(); 320 m_movementAnimation = GetMovementAnimation();
316 321//Console.WriteLine("UMA got {0}", m_movementAnimation);
317 if (m_movementAnimation == "PREJUMP" && !m_scenePresence.Scene.m_usePreJump) 322 if (m_movementAnimation == "PREJUMP" && !m_scenePresence.Scene.m_usePreJump)
318 { 323 {
319 // This was the previous behavior before PREJUMP 324 // This was the previous behavior before PREJUMP
@@ -445,4 +450,4 @@ namespace OpenSim.Region.Framework.Scenes.Animation
445 SendAnimPack(animIDs, sequenceNums, objectIDs); 450 SendAnimPack(animIDs, sequenceNums, objectIDs);
446 } 451 }
447 } 452 }
448} \ No newline at end of file 453}