diff options
| author | meta7 | 2010-08-07 22:25:37 -0700 |
|---|---|---|
| committer | meta7 | 2010-08-07 22:25:37 -0700 |
| commit | a1f2be5e69ef04a8520229e161bdd0527badb844 (patch) | |
| tree | b35c72b166ad965dec1e5215fca968bb8ec46cb1 /OpenSim | |
| parent | Reverted: * Fix the unscripted sit rotation being incorrect .. will commit a... (diff) | |
| download | opensim-SC-a1f2be5e69ef04a8520229e161bdd0527badb844.zip opensim-SC-a1f2be5e69ef04a8520229e161bdd0527badb844.tar.gz opensim-SC-a1f2be5e69ef04a8520229e161bdd0527badb844.tar.bz2 opensim-SC-a1f2be5e69ef04a8520229e161bdd0527badb844.tar.xz | |
The real fix for unscripted sit positions. This one doesn't fuck everything else up. Promise.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 87cf135..fc8e0d7 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2440,7 +2440,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2440 | } | 2440 | } |
| 2441 | 2441 | ||
| 2442 | m_linkedPrim = part.UUID; | 2442 | m_linkedPrim = part.UUID; |
| 2443 | 2443 | if (part.GetAvatarOnSitTarget() != UUID) | |
| 2444 | { | ||
| 2445 | m_offsetRotation = m_offsetRotation / part.RotationOffset; | ||
| 2446 | } | ||
| 2444 | Velocity = Vector3.Zero; | 2447 | Velocity = Vector3.Zero; |
| 2445 | RemoveFromPhysicalScene(); | 2448 | RemoveFromPhysicalScene(); |
| 2446 | Animator.TrySetMovementAnimation(sitAnimation); | 2449 | Animator.TrySetMovementAnimation(sitAnimation); |