diff options
author | Justin Clark-Casey (justincc) | 2012-03-20 23:14:15 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-20 23:14:15 +0000 |
commit | 8bdd38b804584bdbbd7d8e469dd92cc66646bc2a (patch) | |
tree | 7582cbc7c49f1b25339d64557a1eefc755786b86 /OpenSim | |
parent | Move frame loop entirely within Scene.Update() for better future performance ... (diff) | |
parent | slight increase in jump power to make running jump slightly better. (diff) | |
download | opensim-SC_OLD-8bdd38b804584bdbbd7d8e469dd92cc66646bc2a.zip opensim-SC_OLD-8bdd38b804584bdbbd7d8e469dd92cc66646bc2a.tar.gz opensim-SC_OLD-8bdd38b804584bdbbd7d8e469dd92cc66646bc2a.tar.bz2 opensim-SC_OLD-8bdd38b804584bdbbd7d8e469dd92cc66646bc2a.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 82f6486..704d12d 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2293,7 +2293,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2293 | { | 2293 | { |
2294 | if (direc.Z > 2.0f) | 2294 | if (direc.Z > 2.0f) |
2295 | { | 2295 | { |
2296 | direc.Z *= 2.5f; | 2296 | direc.Z *= 2.6f; |
2297 | 2297 | ||
2298 | // TODO: PreJump and jump happen too quickly. Many times prejump gets ignored. | 2298 | // TODO: PreJump and jump happen too quickly. Many times prejump gets ignored. |
2299 | Animator.TrySetMovementAnimation("PREJUMP"); | 2299 | Animator.TrySetMovementAnimation("PREJUMP"); |