From 9d251b1dc518522979b73fdadc0329067b669149 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw
Date: Sun, 20 Jun 2010 15:57:01 -0700
Subject: Fix the StandUp position to calculate as if we're still using the
 child prim id.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 472c389..a376ab1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1822,7 +1822,7 @@ namespace OpenSim.Region.Framework.Scenes
                 //CW: If the part isn't null then we can set the current position 
                 if (part != null)
                 {
-                    Vector3 avWorldStandUp = avStandUp + part.GetWorldPosition() + (m_pos * partRot);			// + av sit offset!
+                    Vector3 avWorldStandUp = avStandUp + part.GetWorldPosition() + ((m_pos - part.OffsetPosition) * partRot);			// + av sit offset!
                     AbsolutePosition = avWorldStandUp;                	 //KF: Fix stand up.
                     part.IsOccupied = false;
                     part.ParentGroup.DeleteAvatar(ControllingClient.AgentId);
-- 
cgit v1.1