aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-07-31 23:38:47 +0200
committerMelanie2012-07-31 23:38:47 +0200
commitef3166d4fe6a6a4753e48cc97d9b45ad66880f3d (patch)
treef2b9c21c293bbb51647960e49ebd294de2f9da09
parentReverse a senseless change in the prioritizer. Why I would want avatars to re... (diff)
parentCorrect StandUp position and rotation (diff)
downloadopensim-SC-ef3166d4fe6a6a4753e48cc97d9b45ad66880f3d.zip
opensim-SC-ef3166d4fe6a6a4753e48cc97d9b45ad66880f3d.tar.gz
opensim-SC-ef3166d4fe6a6a4753e48cc97d9b45ad66880f3d.tar.bz2
opensim-SC-ef3166d4fe6a6a4753e48cc97d9b45ad66880f3d.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
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;