diff options
| author | Melanie | 2012-07-30 03:05:57 +0200 |
|---|---|---|
| committer | Melanie | 2012-07-30 03:05:57 +0200 |
| commit | bd262fe3eda78e97c00bfc285a7c4a7214268de8 (patch) | |
| tree | 9de3652b6a80151515e6fd66268061f1d523a516 /OpenSim/Region/Framework/Scenes | |
| parent | Return world rotation on llGetObjectDetails()'s OBJECT_ROT (diff) | |
| download | opensim-SC_OLD-bd262fe3eda78e97c00bfc285a7c4a7214268de8.zip opensim-SC_OLD-bd262fe3eda78e97c00bfc285a7c4a7214268de8.tar.gz opensim-SC_OLD-bd262fe3eda78e97c00bfc285a7c4a7214268de8.tar.bz2 opensim-SC_OLD-bd262fe3eda78e97c00bfc285a7c4a7214268de8.tar.xz | |
Correct StandUp position and rotation
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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 89df0ce..cdabd45 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1952,7 +1952,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1952 | 1952 | ||
| 1953 | // m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); | 1953 | // m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); |
| 1954 | // ParentPosition = Vector3.Zero; | 1954 | // ParentPosition = Vector3.Zero; |
| 1955 | m_pos += part.GetWorldPosition() + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); | 1955 | m_pos = part.AbsolutePosition + (m_pos * part.GetWorldRotation()) + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); |
| 1956 | if (part.SitTargetAvatar == UUID) | ||
| 1957 | m_bodyRot = part.GetWorldRotation() * part.SitTargetOrientation; | ||
| 1956 | 1958 | ||
| 1957 | ParentID = 0; | 1959 | ParentID = 0; |
| 1958 | ParentPart = null; | 1960 | ParentPart = null; |