aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-05-23 06:12:11 +0100
committerMelanie2010-05-23 06:12:11 +0100
commit72b96e81213c0dd3d586f552bd2cbd9221c5341d (patch)
tree91bc73c579b4f4bb499e5d65a4decaee81c07423 /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-72b96e81213c0dd3d586f552bd2cbd9221c5341d.zip
opensim-SC-72b96e81213c0dd3d586f552bd2cbd9221c5341d.tar.gz
opensim-SC-72b96e81213c0dd3d586f552bd2cbd9221c5341d.tar.bz2
opensim-SC-72b96e81213c0dd3d586f552bd2cbd9221c5341d.tar.xz
Add the SitGround flag back in
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 49a7766..d7660fd 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -140,6 +140,7 @@ namespace OpenSim.Region.Framework.Scenes
140 private Vector3? m_forceToApply; 140 private Vector3? m_forceToApply;
141 private uint m_requestedSitTargetID; 141 private uint m_requestedSitTargetID;
142 private UUID m_requestedSitTargetUUID; 142 private UUID m_requestedSitTargetUUID;
143 public bool SitGround = false;
143 144
144 private SendCourseLocationsMethod m_sendCourseLocationsMethod; 145 private SendCourseLocationsMethod m_sendCourseLocationsMethod;
145 146
@@ -1643,7 +1644,7 @@ namespace OpenSim.Region.Framework.Scenes
1643 } 1644 }
1644 } 1645 }
1645 1646
1646 if (update_movementflag) 1647 if (update_movementflag && !SitGround)
1647 Animator.UpdateMovementAnimations(); 1648 Animator.UpdateMovementAnimations();
1648 1649
1649 m_scene.EventManager.TriggerOnClientMovement(this); 1650 m_scene.EventManager.TriggerOnClientMovement(this);
@@ -1754,6 +1755,8 @@ namespace OpenSim.Region.Framework.Scenes
1754 /// </summary> 1755 /// </summary>
1755 public void StandUp() 1756 public void StandUp()
1756 { 1757 {
1758 SitGround = false;
1759
1757 if (m_parentID != 0) 1760 if (m_parentID != 0)
1758 { 1761 {
1759 SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID); 1762 SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID);