diff options
| author | Melanie | 2012-04-25 19:15:40 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-25 19:15:40 +0100 |
| commit | db31c9fe58f381fda7ddbee79fa467713b7c9bc6 (patch) | |
| tree | 716ea72a563fd837dc39ef28d07bea272764277b /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | set PIDHoverTau and not PIDTau since all physics need that (diff) | |
| download | opensim-SC_OLD-db31c9fe58f381fda7ddbee79fa467713b7c9bc6.zip opensim-SC_OLD-db31c9fe58f381fda7ddbee79fa467713b7c9bc6.tar.gz opensim-SC_OLD-db31c9fe58f381fda7ddbee79fa467713b7c9bc6.tar.bz2 opensim-SC_OLD-db31c9fe58f381fda7ddbee79fa467713b7c9bc6.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index ebfc1bd..18a396f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -755,7 +755,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 755 | m_movementAnimationUpdateCounter = 0; | 755 | m_movementAnimationUpdateCounter = 0; |
| 756 | if (Animator != null) | 756 | if (Animator != null) |
| 757 | { | 757 | { |
| 758 | if(ParentID == 0) // skip it if sitting | 758 | if(ParentID == 0 && !SitGround) // skip it if sitting |
| 759 | Animator.UpdateMovementAnimations(); | 759 | Animator.UpdateMovementAnimations(); |
| 760 | } | 760 | } |
| 761 | else | 761 | else |