aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs28
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index b8a2555..66872fa 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -93,12 +93,12 @@ namespace OpenSim.Region.Environment.Scenes
93 93
94 private enum Dir_ControlFlags 94 private enum Dir_ControlFlags
95 { 95 {
96 DIR_CONTROL_FLAG_FOWARD = MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS, 96 DIR_CONTROL_FLAG_FOWARD = AgentManager.ControlFlags.AGENT_CONTROL_AT_POS,
97 DIR_CONTROL_FLAG_BACK = MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG, 97 DIR_CONTROL_FLAG_BACK = AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG,
98 DIR_CONTROL_FLAG_LEFT = MainAvatar.ControlFlags.AGENT_CONTROL_LEFT_POS, 98 DIR_CONTROL_FLAG_LEFT = AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS,
99 DIR_CONTROL_FLAG_RIGHT = MainAvatar.ControlFlags.AGENT_CONTROL_LEFT_NEG, 99 DIR_CONTROL_FLAG_RIGHT = AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG,
100 DIR_CONTROL_FLAG_UP = MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS, 100 DIR_CONTROL_FLAG_UP = AgentManager.ControlFlags.AGENT_CONTROL_UP_POS,
101 DIR_CONTROL_FLAG_DOWN = MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG 101 DIR_CONTROL_FLAG_DOWN = AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG
102 } 102 }
103 103
104 /// <summary> 104 /// <summary>
@@ -609,7 +609,7 @@ namespace OpenSim.Region.Environment.Scenes
609 //MainLog.Instance.Verbose("CAMERA", "AtAxis:" + m_CameraAtAxis.ToString() + " Center:" + m_CameraCenter.ToString() + " LeftAxis:" + m_CameraLeftAxis.ToString() + " UpAxis:" + m_CameraUpAxis.ToString() + " Far:" + m_CameraFar); 609 //MainLog.Instance.Verbose("CAMERA", "AtAxis:" + m_CameraAtAxis.ToString() + " Center:" + m_CameraCenter.ToString() + " LeftAxis:" + m_CameraLeftAxis.ToString() + " UpAxis:" + m_CameraUpAxis.ToString() + " Far:" + m_CameraFar);
610 610
611 611
612 if ((flags & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) 612 if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
613 { 613 {
614 StandUp(); 614 StandUp();
615 } 615 }
@@ -630,7 +630,7 @@ namespace OpenSim.Region.Environment.Scenes
630 Quaternion q = new Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z); 630 Quaternion q = new Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
631 bool oldflying = PhysicsActor.Flying; 631 bool oldflying = PhysicsActor.Flying;
632 632
633 PhysicsActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0); 633 PhysicsActor.Flying = ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
634 if (PhysicsActor.Flying != oldflying) 634 if (PhysicsActor.Flying != oldflying)
635 { 635 {
636 update_movementflag = true; 636 update_movementflag = true;
@@ -796,7 +796,7 @@ namespace OpenSim.Region.Environment.Scenes
796 } 796 }
797 else 797 else
798 { 798 {
799 if (((m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) && 799 if (((m_movementflag & (uint) AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) &&
800 PhysicsActor.IsColliding) 800 PhysicsActor.IsColliding)
801 { 801 {
802 SendAnimPack(Animations.AnimsLLUUID["CROUCHWALK"], 1); 802 SendAnimPack(Animations.AnimsLLUUID["CROUCHWALK"], 1);
@@ -807,7 +807,7 @@ namespace OpenSim.Region.Environment.Scenes
807 { 807 {
808 SendAnimPack(Animations.AnimsLLUUID["FALLDOWN"], 1); 808 SendAnimPack(Animations.AnimsLLUUID["FALLDOWN"], 1);
809 } 809 }
810 else if (!PhysicsActor.IsColliding && Velocity.Z > 0 && (m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS) != 0) 810 else if (!PhysicsActor.IsColliding && Velocity.Z > 0 && (m_movementflag & (uint) AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) != 0)
811 { 811 {
812 SendAnimPack(Animations.AnimsLLUUID["JUMP"], 1); 812 SendAnimPack(Animations.AnimsLLUUID["JUMP"], 1);
813 } 813 }
@@ -839,7 +839,7 @@ namespace OpenSim.Region.Environment.Scenes
839 } 839 }
840 else 840 else
841 { 841 {
842 if (((m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) && 842 if (((m_movementflag & (uint) AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) &&
843 PhysicsActor.IsColliding) 843 PhysicsActor.IsColliding)
844 { 844 {
845 SendAnimPack(Animations.AnimsLLUUID["CROUCH"], 1); 845 SendAnimPack(Animations.AnimsLLUUID["CROUCH"], 1);
@@ -854,7 +854,7 @@ namespace OpenSim.Region.Environment.Scenes
854 { 854 {
855 SendAnimPack(Animations.AnimsLLUUID["FALLDOWN"], 1); 855 SendAnimPack(Animations.AnimsLLUUID["FALLDOWN"], 1);
856 } 856 }
857 else if (!PhysicsActor.IsColliding && Velocity.Z > 0 && !m_physicsActor.Flying && (m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS) != 0) 857 else if (!PhysicsActor.IsColliding && Velocity.Z > 0 && !m_physicsActor.Flying && (m_movementflag & (uint) AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) != 0)
858 { 858 {
859 SendAnimPack(Animations.AnimsLLUUID["JUMP"], 1); 859 SendAnimPack(Animations.AnimsLLUUID["JUMP"], 1);
860 } 860 }
@@ -955,7 +955,7 @@ namespace OpenSim.Region.Environment.Scenes
955 m_updateCount = 0; 955 m_updateCount = 0;
956 } 956 }
957 } 957 }
958 else if (lastPhysPos.GetDistanceTo(AbsolutePosition) > 0.02) // physics-related movement 958 else if (Util.GetDistanceTo(lastPhysPos, AbsolutePosition) > 0.02) // physics-related movement
959 { 959 {
960 SendTerseUpdateToAllClients(); 960 SendTerseUpdateToAllClients();
961 m_updateCount = 0; 961 m_updateCount = 0;
@@ -1123,7 +1123,7 @@ namespace OpenSim.Region.Environment.Scenes
1123 1123
1124 protected void CheckForSignificantMovement() 1124 protected void CheckForSignificantMovement()
1125 { 1125 {
1126 if (AbsolutePosition.GetDistanceTo(posLastSignificantMove) > 0.02) 1126 if (Util.GetDistanceTo(AbsolutePosition, posLastSignificantMove) > 0.02)
1127 { 1127 {
1128 posLastSignificantMove = AbsolutePosition; 1128 posLastSignificantMove = AbsolutePosition;
1129 if (OnSignificantClientMovement != null) 1129 if (OnSignificantClientMovement != null)