Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
commit
44255fdde2
|
@ -212,9 +212,15 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
}
|
}
|
||||||
|
|
||||||
// Use the camera position for local agents and avatar position for remote agents
|
// Use the camera position for local agents and avatar position for remote agents
|
||||||
Vector3 presencePos = (presence.IsChildAgent) ?
|
// Why would I want that? They could be camming but I still see them at the
|
||||||
presence.AbsolutePosition :
|
// avatar position, so why should I update them as if they were at their
|
||||||
presence.CameraPosition;
|
// camera positions? Makes no sense!
|
||||||
|
// TODO: Fix this mess
|
||||||
|
//Vector3 presencePos = (presence.IsChildAgent) ?
|
||||||
|
// presence.AbsolutePosition :
|
||||||
|
// presence.CameraPosition;
|
||||||
|
|
||||||
|
Vector3 presencePos = presence.AbsolutePosition;
|
||||||
|
|
||||||
// Compute the distance...
|
// Compute the distance...
|
||||||
double distance = Vector3.Distance(presencePos, entityPos);
|
double distance = Vector3.Distance(presencePos, entityPos);
|
||||||
|
|
|
@ -1952,7 +1952,9 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
// m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
|
// m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
|
||||||
// ParentPosition = Vector3.Zero;
|
// 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;
|
ParentID = 0;
|
||||||
ParentPart = null;
|
ParentPart = null;
|
||||||
|
|
Loading…
Reference in New Issue