diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 254fe37..557fc42 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3595,7 +3595,6 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for ju | |||
| 3595 | //Console.WriteLine("UM3 {0}", Velocity); | 3595 | //Console.WriteLine("UM3 {0}", Velocity); |
| 3596 | Velocity = force; // add for jumping | 3596 | Velocity = force; // add for jumping |
| 3597 | } | 3597 | } |
| 3598 | |||
| 3599 | } | 3598 | } |
| 3600 | // } // end realign | 3599 | // } // end realign |
| 3601 | } // add for jumping | 3600 | } // add for jumping |