diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/KeyframeMotion.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index 712ae01..c64a0f8 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |||
@@ -755,7 +755,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
755 | } | 755 | } |
756 | else | 756 | else |
757 | { | 757 | { |
758 | bool lastSteps = remainingSteps < 4; | 758 | // bool lastSteps = remainingSteps < 4; |
759 | |||
759 | Vector3 currentPosition = m_group.AbsolutePosition; | 760 | Vector3 currentPosition = m_group.AbsolutePosition; |
760 | Vector3 motionThisFrame = (Vector3)m_currentFrame.Position - currentPosition; | 761 | Vector3 motionThisFrame = (Vector3)m_currentFrame.Position - currentPosition; |
761 | motionThisFrame /= (float)remainingSteps; | 762 | motionThisFrame /= (float)remainingSteps; |
@@ -776,13 +777,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
776 | } | 777 | } |
777 | 778 | ||
778 | m_group.AbsolutePosition = m_nextPosition; | 779 | m_group.AbsolutePosition = m_nextPosition; |
779 | if(lastSteps) | 780 | // if(lastSteps) |
780 | m_group.RootPart.Velocity = Vector3.Zero; | 781 | // m_group.RootPart.Velocity = Vector3.Zero; |
781 | else | 782 | // else |
782 | m_group.RootPart.Velocity = m_currentVel; | 783 | m_group.RootPart.Velocity = m_currentVel; |
783 | 784 | ||
784 | if(!update && ( | 785 | if(!update && ( |
785 | lastSteps || | 786 | // lastSteps || |
786 | m_skippedUpdates * tickDuration > 0.5 || | 787 | m_skippedUpdates * tickDuration > 0.5 || |
787 | Math.Abs(m_nextPosition.X - currentPosition.X) > 5f || | 788 | Math.Abs(m_nextPosition.X - currentPosition.X) > 5f || |
788 | Math.Abs(m_nextPosition.Y - currentPosition.Y) > 5f || | 789 | Math.Abs(m_nextPosition.Y - currentPosition.Y) > 5f || |