diff options
| author | Justin Clark-Casey (justincc) | 2010-05-21 23:29:37 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-05-21 23:29:37 +0100 |
| commit | e5bcd8b341c974afe3f1fbd06a537319bc7c4485 (patch) | |
| tree | 469c0ccfa74900aa91b13327b4443f63e0966db3 /OpenSim | |
| parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-e5bcd8b341c974afe3f1fbd06a537319bc7c4485.zip opensim-SC_OLD-e5bcd8b341c974afe3f1fbd06a537319bc7c4485.tar.gz opensim-SC_OLD-e5bcd8b341c974afe3f1fbd06a537319bc7c4485.tar.bz2 opensim-SC_OLD-e5bcd8b341c974afe3f1fbd06a537319bc7c4485.tar.xz | |
Apply adaption of patch in http://opensimulator.org/mantis/view.php?id=4628
This prevents a ground-sitting avatar from being moved about in mouselook
Thanks mirceakitsune!
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 2ce1b68..ad7c3ae 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1312,8 +1312,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1312 | // Setting parent ID would fix this, if we knew what value | 1312 | // Setting parent ID would fix this, if we knew what value |
| 1313 | // to use. Or we could add a m_isSitting variable. | 1313 | // to use. Or we could add a m_isSitting variable. |
| 1314 | //Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED"); | 1314 | //Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED"); |
| 1315 | SitGround = true; | 1315 | SitGround = true; |
| 1316 | |||
| 1317 | } | 1316 | } |
| 1318 | 1317 | ||
| 1319 | // In the future, these values might need to go global. | 1318 | // In the future, these values might need to go global. |
| @@ -1330,7 +1329,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1330 | 1329 | ||
| 1331 | bool update_movementflag = false; | 1330 | bool update_movementflag = false; |
| 1332 | 1331 | ||
| 1333 | if (m_allowMovement) | 1332 | if (m_allowMovement && !SitGround) |
| 1334 | { | 1333 | { |
| 1335 | if (agentData.UseClientAgentPosition) | 1334 | if (agentData.UseClientAgentPosition) |
| 1336 | { | 1335 | { |