diff options
| author | Melanie | 2012-08-01 00:07:57 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-01 00:07:57 +0100 |
| commit | 70996603e58171d447faa309212562c776634f65 (patch) | |
| tree | 0cffcf1aa2374415c08353c7ba19471c12d79722 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| download | opensim-SC-70996603e58171d447faa309212562c776634f65.zip opensim-SC-70996603e58171d447faa309212562c776634f65.tar.gz opensim-SC-70996603e58171d447faa309212562c776634f65.tar.bz2 opensim-SC-70996603e58171d447faa309212562c776634f65.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 628fd20..4d3ab51 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1947,7 +1947,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1947 | 1947 | ||
| 1948 | // m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); | 1948 | // m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); |
| 1949 | // ParentPosition = Vector3.Zero; | 1949 | // ParentPosition = Vector3.Zero; |
| 1950 | m_pos += part.GetWorldPosition() + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); | 1950 | m_pos = part.AbsolutePosition + (m_pos * part.GetWorldRotation()) + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); |
| 1951 | if (part.SitTargetAvatar == UUID) | ||
| 1952 | m_bodyRot = part.GetWorldRotation() * part.SitTargetOrientation; | ||
| 1951 | 1953 | ||
| 1952 | ParentID = 0; | 1954 | ParentID = 0; |
| 1953 | ParentPart = null; | 1955 | ParentPart = null; |