From a5fcc0c0c0f41ea3cf490e8061f71a6a2afeca02 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 20 Jul 2014 14:47:35 +0100 Subject: [PATCH] remove avn hack on sitted avatars positions --- .../ClientStack/Linden/UDP/LLClientView.cs | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index b4a0a987ad..f7338fcbfa 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -5132,22 +5132,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP position = presence.OffsetPosition; rotation = presence.Rotation; - - if (presence.ParentID != 0) - { - 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; - } + angularVelocity = presence.AngularVelocity; + rotation = presence.Rotation; attachPoint = 0; // m_log.DebugFormat( @@ -5266,17 +5252,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP Vector3 offsetPosition = data.OffsetPosition; Quaternion rotation = data.Rotation; 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( // "[LLCLIENTVIEW]: Sending full update to {0} with position {1} in {2}", Name, data.OffsetPosition, m_scene.Name);