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

remove avn hack on sitted avatars positions

avinationmerge
UbitUmarov 2014-07-20 14:47:35 +01:00
parent 79aea3e588
commit a5fcc0c0c0
1 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -5132,22 +5132,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
position = presence.OffsetPosition; position = presence.OffsetPosition;
rotation = presence.Rotation; rotation = presence.Rotation;
angularVelocity = presence.AngularVelocity;
if (presence.ParentID != 0) rotation = presence.Rotation;
{
SceneObjectPart part = m_scene.GetSceneObjectPart(presence.ParentID);
if (part != null && part != part.ParentGroup.RootPart)
{
position = part.OffsetPosition + presence.OffsetPosition * part.RotationOffset;
rotation = part.RotationOffset * presence.Rotation;
}
angularVelocity = Vector3.Zero;
}
else
{
angularVelocity = presence.AngularVelocity;
rotation = presence.Rotation;
}
attachPoint = 0; attachPoint = 0;
// m_log.DebugFormat( // m_log.DebugFormat(
@ -5266,17 +5252,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
Vector3 offsetPosition = data.OffsetPosition; Vector3 offsetPosition = data.OffsetPosition;
Quaternion rotation = data.Rotation; Quaternion rotation = data.Rotation;
uint parentID = data.ParentID; uint parentID = data.ParentID;
if (parentID != 0)
{
SceneObjectPart part = m_scene.GetSceneObjectPart(parentID);
if (part != null && part != part.ParentGroup.RootPart)
{
offsetPosition = part.OffsetPosition + data.OffsetPosition * part.RotationOffset;
rotation = part.RotationOffset * data.Rotation;
parentID = part.ParentGroup.RootPart.LocalId;
}
}
// m_log.DebugFormat( // m_log.DebugFormat(
// "[LLCLIENTVIEW]: Sending full update to {0} with position {1} in {2}", Name, data.OffsetPosition, m_scene.Name); // "[LLCLIENTVIEW]: Sending full update to {0} with position {1} in {2}", Name, data.OffsetPosition, m_scene.Name);