From a8cfbbe963529728acbab4d9936cb89af380d1ac Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 20 Feb 2008 18:38:20 +0000 Subject: Minor cleanup. --- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs') diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 4f68817..2d01282 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -873,7 +873,6 @@ namespace OpenSim.Region.Environment.Scenes // TODO: determine position to sit at based on scene geometry; don't trust offset from client // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it - // Is a sit target available? Vector3 avSitOffSet = part.GetSitTargetPosition(); Quaternion avSitOrientation = part.GetSitTargetOrientation(); @@ -893,15 +892,12 @@ namespace OpenSim.Region.Environment.Scenes autopilot = false; } - pos = part.AbsolutePosition + offset; if (m_physicsActor != null) { - // // If we're not using the client autopilot, we're immediately warping the avatar to the location // We can remove the physicsActor until they stand up. - // m_sitAvatarHeight = m_physicsActor.Size.Z; if (autopilot) @@ -913,17 +909,13 @@ namespace OpenSim.Region.Environment.Scenes RemoveFromPhysicalScene(); AbsolutePosition = pos + new LLVector3(0.0f, 0.0f, m_sitAvatarHeight); } - else - { - } } else { RemoveFromPhysicalScene(); } - } // Physactor != null - } // part != null - + } + } avatarSitResponse.SitTransform.AutoPilot = autopilot; avatarSitResponse.SitTransform.SitPosition = offset; -- cgit v1.1