diff options
| author | Justin Clark-Casey (justincc) | 2013-11-23 02:28:30 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-11-23 02:28:30 +0000 |
| commit | eb172be5412a631db115346b4e75e5731b989920 (patch) | |
| tree | c58f3226ccf7b8a9574045d272e96e9f3a89b7e2 /OpenSim | |
| parent | Revert "Refix fix for sitting on non-root linked prims with explicit sit targ... (diff) | |
| download | opensim-SC_OLD-eb172be5412a631db115346b4e75e5731b989920.zip opensim-SC_OLD-eb172be5412a631db115346b4e75e5731b989920.tar.gz opensim-SC_OLD-eb172be5412a631db115346b4e75e5731b989920.tar.bz2 opensim-SC_OLD-eb172be5412a631db115346b4e75e5731b989920.tar.xz | |
Revert "Fix non-root prim sit positions for prims where a sit target has been specified as well."
Revert to place on separate branch for now
This reverts commit 70e651a8d1d0c2a48c4f26cd1c70bee098c11a57.
Diffstat (limited to 'OpenSim')
| -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 127ad40..17b6126 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 - part.GroupPosition; | 2593 | m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT; |
| 2594 | Rotation = sitTargetOrient; | 2594 | Rotation = sitTargetOrient; |
| 2595 | ParentPosition = part.AbsolutePosition; | 2595 | ParentPosition = part.AbsolutePosition; |
| 2596 | } | 2596 | } |