diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 17b55bf..d40132e 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1537,8 +1537,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1537 | if (update_movementflag | 1537 | if (update_movementflag |
1538 | && ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) == 0) | 1538 | && ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) == 0) |
1539 | && (m_parentID == 0) | 1539 | && (m_parentID == 0) |
1540 | && !SitGround | 1540 | && !SitGround) |
1541 | && !MovingToTarget) | ||
1542 | Animator.UpdateMovementAnimations(); | 1541 | Animator.UpdateMovementAnimations(); |
1543 | } | 1542 | } |
1544 | 1543 | ||
@@ -1711,9 +1710,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1711 | if (pos.Z - terrainHeight < 0.2) | 1710 | if (pos.Z - terrainHeight < 0.2) |
1712 | pos.Z = terrainHeight; | 1711 | pos.Z = terrainHeight; |
1713 | 1712 | ||
1714 | // m_log.DebugFormat( | 1713 | m_log.DebugFormat( |
1715 | // "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}", | 1714 | "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}", |
1716 | // Name, pos, terrainHeight, m_scene.RegionInfo.RegionName); | 1715 | Name, pos, terrainHeight, m_scene.RegionInfo.RegionName); |
1717 | 1716 | ||
1718 | if (pos.Z > terrainHeight) | 1717 | if (pos.Z > terrainHeight) |
1719 | PhysicsActor.Flying = true; | 1718 | PhysicsActor.Flying = true; |