aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2012-05-03 02:07:55 +0200
committerMelanie2012-05-03 02:07:55 +0200
commit2af7f50f26271129a2265f0cae7a5515cc7ba315 (patch)
tree1020feabf435b66840a5e8f582cc4aa2f3b4e1fb /OpenSim/Region/Framework/Scenes
parentClear permissions given to the object we stand up from (diff)
downloadopensim-SC_OLD-2af7f50f26271129a2265f0cae7a5515cc7ba315.zip
opensim-SC_OLD-2af7f50f26271129a2265f0cae7a5515cc7ba315.tar.gz
opensim-SC_OLD-2af7f50f26271129a2265f0cae7a5515cc7ba315.tar.bz2
opensim-SC_OLD-2af7f50f26271129a2265f0cae7a5515cc7ba315.tar.xz
Stabilize sit position on region crossing
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b0147f2..7136cfc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -756,7 +756,13 @@ namespace OpenSim.Region.Framework.Scenes
756 m_movementAnimationUpdateCounter = 0; 756 m_movementAnimationUpdateCounter = 0;
757 if (Animator != null) 757 if (Animator != null)
758 { 758 {
759 if(ParentID == 0 && !SitGround) // skip it if sitting 759 // If the parentID == 0 we are not sitting
760 // if !SitGournd then we are not sitting on the ground
761 // Fairly straightforward, now here comes the twist
762 // if ParentUUID is NOT UUID.Zero, we are looking to
763 // be sat on an object that isn't there yet. Should
764 // be treated as if sat.
765 if(ParentID == 0 && !SitGround && ParentUUID == UUID.Zero) // skip it if sitting
760 Animator.UpdateMovementAnimations(); 766 Animator.UpdateMovementAnimations();
761 } 767 }
762 else 768 else