aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares2007-11-13 05:10:14 +0000
committerTeravus Ovares2007-11-13 05:10:14 +0000
commit10b41ba4554e3a13796cc3b55663e373f12af2cb (patch)
treec6b77dba10f877ff21f629a60f22e521602de156 /OpenSim/Region/Environment/Scenes
parent* Added AV Height Glue & Avatar Height stored on m_AVHeight in ScenePresence (diff)
downloadopensim-SC_OLD-10b41ba4554e3a13796cc3b55663e373f12af2cb.zip
opensim-SC_OLD-10b41ba4554e3a13796cc3b55663e373f12af2cb.tar.gz
opensim-SC_OLD-10b41ba4554e3a13796cc3b55663e373f12af2cb.tar.bz2
opensim-SC_OLD-10b41ba4554e3a13796cc3b55663e373f12af2cb.tar.xz
* Fixed the walk vs fall animation.
* Tweaked a few things
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 69bf05a..48f3ef0 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -458,7 +458,7 @@ namespace OpenSim.Region.Environment.Scenes
458 + (((float)m_visualParams[125] / 255.0f) / 1.5f); 458 + (((float)m_visualParams[125] / 255.0f) / 1.5f);
459 if (PhysicsActor != null) 459 if (PhysicsActor != null)
460 { 460 {
461 PhysicsVector SetSize = new PhysicsVector(0, 0, m_avHeight); 461 PhysicsVector SetSize = new PhysicsVector(0.45f, 0.6f, m_avHeight);
462 PhysicsActor.Size = SetSize; 462 PhysicsActor.Size = SetSize;
463 } 463 }
464 //OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "Set Avatar Height to: " + (1.50856f + (((float)m_visualParams[25] / 255.0f) * (2.525506f - 1.50856f))).ToString() + "m" + " Leglength: " + ((float)m_visualParams[125]).ToString() + ":" + (((float)m_visualParams[125] / 255.0f)).ToString() + "m"); 464 //OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "Set Avatar Height to: " + (1.50856f + (((float)m_visualParams[25] / 255.0f) * (2.525506f - 1.50856f))).ToString() + "m" + " Leglength: " + ((float)m_visualParams[125]).ToString() + ":" + (((float)m_visualParams[125] / 255.0f)).ToString() + "m");
@@ -681,11 +681,11 @@ namespace OpenSim.Region.Environment.Scenes
681 } 681 }
682 else 682 else
683 { 683 {
684 if (!PhysicsActor.IsColliding && m_physicsActor.Velocity.Z > 6) 684 if (!PhysicsActor.IsColliding && m_physicsActor.Velocity.Z < -6)
685 { 685 {
686 SendAnimPack(Animations.AnimsLLUUID["FALLDOWN"], 1); 686 SendAnimPack(Animations.AnimsLLUUID["FALLDOWN"], 1);
687 } 687 }
688 else if (!PhysicsActor.IsColliding && Velocity.Z > 0) 688 else if (!PhysicsActor.IsColliding && Velocity.Z > 0 && (m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS) != 0)
689 { 689 {
690 SendAnimPack(Animations.AnimsLLUUID["JUMP"], 1); 690 SendAnimPack(Animations.AnimsLLUUID["JUMP"], 1);
691 } 691 }
@@ -716,11 +716,11 @@ namespace OpenSim.Region.Environment.Scenes
716 } 716 }
717 else 717 else
718 { 718 {
719 if (!PhysicsActor.IsColliding && m_physicsActor.Velocity.Z > 6 && !m_physicsActor.Flying) 719 if (!PhysicsActor.IsColliding && m_physicsActor.Velocity.Z < -6 && !m_physicsActor.Flying)
720 { 720 {
721 SendAnimPack(Animations.AnimsLLUUID["FALLDOWN"], 1); 721 SendAnimPack(Animations.AnimsLLUUID["FALLDOWN"], 1);
722 } 722 }
723 else if (!PhysicsActor.IsColliding && Velocity.Z > 0 && !m_physicsActor.Flying) 723 else if (!PhysicsActor.IsColliding && Velocity.Z > 0 && !m_physicsActor.Flying && (m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS) != 0)
724 { 724 {
725 SendAnimPack(Animations.AnimsLLUUID["JUMP"], 1); 725 SendAnimPack(Animations.AnimsLLUUID["JUMP"], 1);
726 } 726 }