From feba36aaf3c456d3ee10fb5d12c3bd42d0801779 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Wed, 16 Jan 2008 22:53:49 +0000 Subject: [PATCH] * Fixed standing up so that you're at the new position of the prim if you move the prim and then stand up! * Enter llSetPos elevators and conveyors n' stuff.! --- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 30ad4a541e..959e6eeac2 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -790,14 +790,17 @@ namespace OpenSim.Region.Environment.Scenes // Reset sit target. if (part.GetAvatarOnSitTarget() == UUID) part.SetAvatarOnSitTarget(LLUUID.Zero); - } - m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight); - m_parentPosition = new LLVector3(); + m_parentPosition = part.GetWorldPosition(); + } if (m_physicsActor == null) AddToPhysicalScene(); + m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight); + m_parentPosition = new LLVector3(); + + m_parentID = 0; SendFullUpdateToAllClients(); }