diff options
author | Diva Canto | 2010-05-23 12:23:16 -0700 |
---|---|---|
committer | Diva Canto | 2010-05-23 12:23:16 -0700 |
commit | 30e94cd0753809094b9b01b664e0ae643db28492 (patch) | |
tree | 4a76c17218f68ff6aeeb43524b3298b2107e74fc /OpenSim/Region/Framework | |
parent | The 8th migration statement in AssetStore.migrations didn't look right. (diff) | |
parent | Remove an unneeded conditional (diff) | |
download | opensim-SC-30e94cd0753809094b9b01b664e0ae643db28492.zip opensim-SC-30e94cd0753809094b9b01b664e0ae643db28492.tar.gz opensim-SC-30e94cd0753809094b9b01b664e0ae643db28492.tar.bz2 opensim-SC-30e94cd0753809094b9b01b664e0ae643db28492.tar.xz |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 2ce1b68..3964b0b 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 | { |
@@ -1672,8 +1671,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1672 | /// </summary> | 1671 | /// </summary> |
1673 | public void StandUp() | 1672 | public void StandUp() |
1674 | { | 1673 | { |
1675 | if (SitGround) | 1674 | SitGround = false; |
1676 | SitGround = false; | ||
1677 | 1675 | ||
1678 | if (m_parentID != 0) | 1676 | if (m_parentID != 0) |
1679 | { | 1677 | { |