Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 6 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index cca296e..fc8e0d7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2053,13 +2053,9 @@ namespace OpenSim.Region.Framework.Scenes
 //Console.WriteLine("Camera Eye  ={0}", cameraEyeOffset);

 

             //NOTE: SendSitResponse should be relative to the GROUP *NOT* THE PRIM if we're sitting on a child

-            Quaternion roffset = Quaternion.Identity;

-            if (SitTargetisSet)

-            {

-                roffset = part.RotationOffset;

-            }

-            ControllingClient.SendSitResponse(part.ParentGroup.UUID, ((offset * roffset) + part.OffsetPosition), sitOrientation / part.RotationOffset, autopilot, cameraAtOffset, cameraEyeOffset, forceMouselook);

+            ControllingClient.SendSitResponse(part.ParentGroup.UUID, ((offset * part.RotationOffset) + part.OffsetPosition), sitOrientation, autopilot, cameraAtOffset, cameraEyeOffset, forceMouselook);

             

+            m_requestedSitTargetUUID = part.UUID;               //KF: Correct autopilot target

             // This calls HandleAgentSit twice, once from here, and the client calls

             // HandleAgentSit itself after it gets to the location

             // It doesn't get to the location until we've moved them there though

@@ -2444,7 +2440,10 @@ namespace OpenSim.Region.Framework.Scenes
             }

 

             m_linkedPrim = part.UUID;

-            m_offsetRotation = m_offsetRotation / part.RotationOffset;

+            if (part.GetAvatarOnSitTarget() != UUID)

+            {

+                m_offsetRotation = m_offsetRotation / part.RotationOffset;

+            }

             Velocity = Vector3.Zero;

             RemoveFromPhysicalScene();

             Animator.TrySetMovementAnimation(sitAnimation);