OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
Melanie 2012-07-31 23:38:47 +02:00
parent e40e1dc9e6 bd262fe3ed
commit ef3166d4fe
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1952,7 +1952,9 @@ namespace OpenSim.Region.Framework.Scenes
// m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
// ParentPosition = Vector3.Zero;
m_pos += part.GetWorldPosition() + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
m_pos = part.AbsolutePosition + (m_pos * part.GetWorldRotation()) + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
if (part.SitTargetAvatar == UUID)
m_bodyRot = part.GetWorldRotation() * part.SitTargetOrientation;
ParentID = 0;
ParentPart = null;