diff options
| author | UbitUmarov | 2015-09-30 20:37:14 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-30 20:37:14 +0100 |
| commit | 6df75a927cfa36d0f3876653033a9d12e3e78dfd (patch) | |
| tree | 62399cfc082e78b2123fc565839c5c1b14ff4391 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | add get method on physics actors PIDHoverActive (diff) | |
| download | opensim-SC-6df75a927cfa36d0f3876653033a9d12e3e78dfd.zip opensim-SC-6df75a927cfa36d0f3876653033a9d12e3e78dfd.tar.gz opensim-SC-6df75a927cfa36d0f3876653033a9d12e3e78dfd.tar.bz2 opensim-SC-6df75a927cfa36d0f3876653033a9d12e3e78dfd.tar.xz | |
let hoverheight rest position be a falling state
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 4252bd6..9996f6e 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3363,7 +3363,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3363 | 3363 | ||
| 3364 | // m_log.DebugFormat("[SCENE PRESENCE]: Force to apply before modification was {0} for {1}", direc, Name); | 3364 | // m_log.DebugFormat("[SCENE PRESENCE]: Force to apply before modification was {0} for {1}", direc, Name); |
| 3365 | 3365 | ||
| 3366 | if (Animator.currentControlState == ScenePresenceAnimator.motionControlStates.falling) | 3366 | if (Animator.currentControlState == ScenePresenceAnimator.motionControlStates.falling |
| 3367 | && (PhysicsActor == null || !PhysicsActor.PIDHoverActive)) | ||
| 3367 | { | 3368 | { |
| 3368 | if (breaking) | 3369 | if (breaking) |
| 3369 | direc.Z = -9999f; //hack to tell physics to stop on Z | 3370 | direc.Z = -9999f; //hack to tell physics to stop on Z |