diff options
| author | Tom Grimshaw | 2010-06-20 15:57:01 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-20 15:57:01 -0700 |
| commit | 9d251b1dc518522979b73fdadc0329067b669149 (patch) | |
| tree | 9e452711b773e2a965d6edbab2346531b3a90083 /OpenSim/Region/Framework/Scenes | |
| parent | Fix the sit code to ensure that we use the root prim of a linkset as a refere... (diff) | |
| download | opensim-SC_OLD-9d251b1dc518522979b73fdadc0329067b669149.zip opensim-SC_OLD-9d251b1dc518522979b73fdadc0329067b669149.tar.gz opensim-SC_OLD-9d251b1dc518522979b73fdadc0329067b669149.tar.bz2 opensim-SC_OLD-9d251b1dc518522979b73fdadc0329067b669149.tar.xz | |
Fix the StandUp position to calculate as if we're still using the child prim id.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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 472c389..a376ab1 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1822,7 +1822,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1822 | //CW: If the part isn't null then we can set the current position | 1822 | //CW: If the part isn't null then we can set the current position |
| 1823 | if (part != null) | 1823 | if (part != null) |
| 1824 | { | 1824 | { |
| 1825 | Vector3 avWorldStandUp = avStandUp + part.GetWorldPosition() + (m_pos * partRot); // + av sit offset! | 1825 | Vector3 avWorldStandUp = avStandUp + part.GetWorldPosition() + ((m_pos - part.OffsetPosition) * partRot); // + av sit offset! |
| 1826 | AbsolutePosition = avWorldStandUp; //KF: Fix stand up. | 1826 | AbsolutePosition = avWorldStandUp; //KF: Fix stand up. |
| 1827 | part.IsOccupied = false; | 1827 | part.IsOccupied = false; |
| 1828 | part.ParentGroup.DeleteAvatar(ControllingClient.AgentId); | 1828 | part.ParentGroup.DeleteAvatar(ControllingClient.AgentId); |