diff options
| author | Melanie | 2012-03-20 20:48:55 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-20 20:48:55 +0000 |
| commit | fdd4d787a431bf3becdb8584be748308fe113115 (patch) | |
| tree | ccbeef34352f4c8985cf663dd13756a14fb8fff3 /OpenSim/Region/Framework | |
| parent | Merge branch 'ubitwork' (diff) | |
| parent | reduce avatar verticle jump from the absurd 5 meter jump to a less (diff) | |
| download | opensim-SC_OLD-fdd4d787a431bf3becdb8584be748308fe113115.zip opensim-SC_OLD-fdd4d787a431bf3becdb8584be748308fe113115.tar.gz opensim-SC_OLD-fdd4d787a431bf3becdb8584be748308fe113115.tar.bz2 opensim-SC_OLD-fdd4d787a431bf3becdb8584be748308fe113115.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 c4aaebe..9baee05 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2374,7 +2374,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2374 | { | 2374 | { |
| 2375 | if (direc.Z > 2.0f) | 2375 | if (direc.Z > 2.0f) |
| 2376 | { | 2376 | { |
| 2377 | direc.Z *= 3.0f; | 2377 | direc.Z *= 2.5f; |
| 2378 | 2378 | ||
| 2379 | // TODO: PreJump and jump happen too quickly. Many times prejump gets ignored. | 2379 | // TODO: PreJump and jump happen too quickly. Many times prejump gets ignored. |
| 2380 | Animator.TrySetMovementAnimation("PREJUMP"); | 2380 | Animator.TrySetMovementAnimation("PREJUMP"); |