diff options
author | Teravus Ovares | 2008-01-04 04:09:18 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-01-04 04:09:18 +0000 |
commit | f0b149dfc163dac527964d13bf1920f0af016a14 (patch) | |
tree | b4093b12c39a20dd570b3e50c8d767b5d90e3398 /OpenSim/Region/Environment | |
parent | * Added the ability for estate managers to use the magic secondlife blue card... (diff) | |
download | opensim-SC-f0b149dfc163dac527964d13bf1920f0af016a14.zip opensim-SC-f0b149dfc163dac527964d13bf1920f0af016a14.tar.gz opensim-SC-f0b149dfc163dac527964d13bf1920f0af016a14.tar.bz2 opensim-SC-f0b149dfc163dac527964d13bf1920f0af016a14.tar.xz |
* Fixed situation where sometimes your avatar tries to land and gets 'put' 80 meters into the air immediately.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 3aa9583..a8042d4 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -553,7 +553,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
553 | // Add 1/6 the avatar's height to it's position so it doesn't shoot into the air | 553 | // Add 1/6 the avatar's height to it's position so it doesn't shoot into the air |
554 | // when the avatar stands up | 554 | // when the avatar stands up |
555 | 555 | ||
556 | AbsolutePosition = AbsolutePosition + new LLVector3(0, 0, (m_avHeight/6)); | 556 | if (m_avHeight != 127.0f) |
557 | { | ||
558 | AbsolutePosition = AbsolutePosition + new LLVector3(0, 0, (m_avHeight / 6)); | ||
559 | } | ||
560 | else | ||
561 | { | ||
562 | AbsolutePosition = AbsolutePosition + new LLVector3(0, 0, (1.56f / 6)); | ||
563 | } | ||
557 | SetMovementAnimation(Animations.AnimsLLUUID["LAND"], 2); | 564 | SetMovementAnimation(Animations.AnimsLLUUID["LAND"], 2); |
558 | SendFullUpdateToAllClients(); | 565 | SendFullUpdateToAllClients(); |
559 | } | 566 | } |