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

Merge branch 'avination' into careminster

avinationmerge
Melanie 2012-08-01 00:07:57 +01:00
parent e012c81d7c ef3166d4fe
commit 70996603e5
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/Prioritizer.cs
View File

@ -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);

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

@ -1947,7 +1947,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;