diff options
| author | Justin Clark-Casey (justincc) | 2013-11-23 01:32:29 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-11-23 01:32:29 +0000 |
| commit | 70e651a8d1d0c2a48c4f26cd1c70bee098c11a57 (patch) | |
| tree | a337a3f4bb6cdbb6924abe7d6e1055659301da4d /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Stop .NET 4 complaining on Windows when it tries to load in DLLs that haven't... (diff) | |
| download | opensim-SC_OLD-70e651a8d1d0c2a48c4f26cd1c70bee098c11a57.zip opensim-SC_OLD-70e651a8d1d0c2a48c4f26cd1c70bee098c11a57.tar.gz opensim-SC_OLD-70e651a8d1d0c2a48c4f26cd1c70bee098c11a57.tar.bz2 opensim-SC_OLD-70e651a8d1d0c2a48c4f26cd1c70bee098c11a57.tar.xz | |
Fix non-root prim sit positions for prims where a sit target has been specified as well.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -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 17b6126..127ad40 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2590,7 +2590,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2590 | 2590 | ||
| 2591 | //Quaternion result = (sitTargetOrient * vq) * nq; | 2591 | //Quaternion result = (sitTargetOrient * vq) * nq; |
| 2592 | 2592 | ||
| 2593 | m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT; | 2593 | m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - part.GroupPosition; |
| 2594 | Rotation = sitTargetOrient; | 2594 | Rotation = sitTargetOrient; |
| 2595 | ParentPosition = part.AbsolutePosition; | 2595 | ParentPosition = part.AbsolutePosition; |
| 2596 | } | 2596 | } |