From cacbb5c165a8e97082e9599def824bc0185f4c38 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Sat, 5 Apr 2014 02:16:14 +0100 Subject: [PATCH] Don't re-retrieve sit part in SP.HandleAgentSit() when we already have it (this time with the right code change) --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 6e613a777d..fdc1f32425 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -2866,7 +2866,6 @@ namespace OpenSim.Region.Framework.Scenes return; } - if (part.SitTargetAvatar == UUID) { Vector3 sitTargetPos = part.SitTargetPosition; @@ -2935,7 +2934,7 @@ namespace OpenSim.Region.Framework.Scenes // Name, part.AbsolutePosition, m_pos, ParentPosition, part.Name, part.LocalId); } - ParentPart = m_scene.GetSceneObjectPart(m_requestedSitTargetID); + ParentPart = part; ParentID = m_requestedSitTargetID; m_AngularVelocity = Vector3.Zero; Velocity = Vector3.Zero;