aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs
diff options
context:
space:
mode:
authorUbitUmarov2016-11-16 13:07:23 +0000
committerUbitUmarov2016-11-16 13:07:23 +0000
commitec8393571f88ab54a47ffcb91d0f82a815a682ad (patch)
tree362b08a13538a55ef2bff7a3e4290341ce9f159c /OpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs
parentMerge branch 'master' into httptests (diff)
parent fix parsing of a vector4 and storing on a lsl quaternion needed for lightSha... (diff)
downloadopensim-SC-ec8393571f88ab54a47ffcb91d0f82a815a682ad.zip
opensim-SC-ec8393571f88ab54a47ffcb91d0f82a815a682ad.tar.gz
opensim-SC-ec8393571f88ab54a47ffcb91d0f82a815a682ad.tar.bz2
opensim-SC-ec8393571f88ab54a47ffcb91d0f82a815a682ad.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs8
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs
index 79ee00f..40c6b98 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs
@@ -108,10 +108,6 @@ public class BSActorAvatarMove : BSActor
108 { 108 {
109 if (m_velocityMotor != null) 109 if (m_velocityMotor != null)
110 { 110 {
111// if (targ == OMV.Vector3.Zero)
112// Util.PrintCallStack();
113//
114// Console.WriteLine("SetVelocityAndTarget, {0} {1}", vel, targ);
115 m_velocityMotor.Reset(); 111 m_velocityMotor.Reset();
116 m_velocityMotor.SetTarget(targ); 112 m_velocityMotor.SetTarget(targ);
117 m_velocityMotor.SetCurrent(vel); 113 m_velocityMotor.SetCurrent(vel);
@@ -128,7 +124,7 @@ public class BSActorAvatarMove : BSActor
128 m_waitingForLowVelocityForStationary = true; 124 m_waitingForLowVelocityForStationary = true;
129 } 125 }
130 126
131 // If a movement motor has not been created, create one and start the hovering. 127 // If a movement motor has not been created, create one and start the movement
132 private void ActivateAvatarMove() 128 private void ActivateAvatarMove()
133 { 129 {
134 if (m_velocityMotor == null) 130 if (m_velocityMotor == null)
@@ -161,7 +157,7 @@ public class BSActorAvatarMove : BSActor
161 } 157 }
162 } 158 }
163 159
164 // Called just before the simulation step. Update the vertical position for hoverness. 160 // Called just before the simulation step.
165 private void Mover(float timeStep) 161 private void Mover(float timeStep)
166 { 162 {
167 // Don't do movement while the object is selected. 163 // Don't do movement while the object is selected.