diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 704bad8..c16c544 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1990,7 +1990,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1990 | // m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name); | 1990 | // m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name); |
1991 | 1991 | ||
1992 | MovingToTarget = false; | 1992 | MovingToTarget = false; |
1993 | MoveToPositionTarget = Vector3.Zero; | 1993 | // MoveToPositionTarget = Vector3.Zero; |
1994 | m_forceToApply = null; // cancel possible last action | ||
1994 | 1995 | ||
1995 | // We need to reset the control flag as the ScenePresenceAnimator uses this to determine the correct | 1996 | // We need to reset the control flag as the ScenePresenceAnimator uses this to determine the correct |
1996 | // resting animation (e.g. hover or stand). NPCs don't have a client that will quickly reset this flag. | 1997 | // resting animation (e.g. hover or stand). NPCs don't have a client that will quickly reset this flag. |
@@ -2148,10 +2149,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2148 | } | 2149 | } |
2149 | 2150 | ||
2150 | if (MovingToTarget) | 2151 | if (MovingToTarget) |
2151 | { | ||
2152 | ResetMoveToTarget(); | 2152 | ResetMoveToTarget(); |
2153 | m_forceToApply = null; | ||
2154 | } | ||
2155 | 2153 | ||
2156 | Velocity = Vector3.Zero; | 2154 | Velocity = Vector3.Zero; |
2157 | 2155 | ||
@@ -2272,10 +2270,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2272 | RemoveFromPhysicalScene(); | 2270 | RemoveFromPhysicalScene(); |
2273 | 2271 | ||
2274 | if (MovingToTarget) | 2272 | if (MovingToTarget) |
2275 | { | ||
2276 | ResetMoveToTarget(); | 2273 | ResetMoveToTarget(); |
2277 | m_forceToApply = null; | ||
2278 | } | ||
2279 | 2274 | ||
2280 | Velocity = Vector3.Zero; | 2275 | Velocity = Vector3.Zero; |
2281 | 2276 | ||