diff options
author | Kitto Flora | 2010-09-06 21:45:07 +0000 |
---|---|---|
committer | Kitto Flora | 2010-09-06 21:45:07 +0000 |
commit | c719e016ed9bfbb56fd8c571b9b7b9622bcef566 (patch) | |
tree | edb19549fc6f6966ac2c56d18a3d875fc56a6281 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
download | opensim-SC-c719e016ed9bfbb56fd8c571b9b7b9622bcef566.zip opensim-SC-c719e016ed9bfbb56fd8c571b9b7b9622bcef566.tar.gz opensim-SC-c719e016ed9bfbb56fd8c571b9b7b9622bcef566.tar.bz2 opensim-SC-c719e016ed9bfbb56fd8c571b9b7b9622bcef566.tar.xz |
Falling animation fix, comment out instrumentation.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 2ed00a0..faf6354 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2568,9 +2568,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
2568 | 2568 | ||
2569 | if (actor != null) | 2569 | if (actor != null) |
2570 | { | 2570 | { |
2571 | if (actor.Flying) | 2571 | // rm falling if (actor.Flying) |
2572 | if ((actor.Flying) || Animator.m_falling) // add for falling lateral speed | ||
2572 | { | 2573 | { |
2573 | direc *= 4.0f; | 2574 | // rm speed mod direc *= 4.0f; |
2575 | direc *= 5.2f; // for speed mod | ||
2574 | //bool controlland = (((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) || ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0)); | 2576 | //bool controlland = (((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) || ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0)); |
2575 | //bool colliding = (m_physicsActor.IsColliding==true); | 2577 | //bool colliding = (m_physicsActor.IsColliding==true); |
2576 | //if (controlland) | 2578 | //if (controlland) |