diff options
| author | Justin Clark-Casey (justincc) | 2011-08-11 03:16:46 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-08-11 03:16:46 +0100 |
| commit | b3a4b1053157d65d0068bf5b3362dc28da4be85a (patch) | |
| tree | b15908ceaf710a045671415c892f2294c8311d39 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | minor: a little bit of log message correction/commenting out (diff) | |
| download | opensim-SC-b3a4b1053157d65d0068bf5b3362dc28da4be85a.zip opensim-SC-b3a4b1053157d65d0068bf5b3362dc28da4be85a.tar.gz opensim-SC-b3a4b1053157d65d0068bf5b3362dc28da4be85a.tar.bz2 opensim-SC-b3a4b1053157d65d0068bf5b3362dc28da4be85a.tar.xz | |
eliminate redundant ground sitting checks since these are already done in enclosing control structures
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index afa896c..18632d7 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1537,10 +1537,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1537 | AddNewMovement(agent_control_v3); | 1537 | AddNewMovement(agent_control_v3); |
| 1538 | } | 1538 | } |
| 1539 | 1539 | ||
| 1540 | if (update_movementflag | 1540 | if (update_movementflag && m_parentID == 0) |
| 1541 | && ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) == 0) | ||
| 1542 | && (m_parentID == 0) | ||
| 1543 | && !SitGround) | ||
| 1544 | Animator.UpdateMovementAnimations(); | 1541 | Animator.UpdateMovementAnimations(); |
| 1545 | } | 1542 | } |
| 1546 | 1543 | ||