fix: Correct information sent in AvatarSitResponse

This now matches SL's response to the same inputs as verified by reviewing the Alchemy Message Log response after setting up identical tests in both grids.
HalcyonGrid · Jun 9, 2021 · 4e598d9 · 4e598d9
1 parent 0d235d8
commit 4e598d9
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2605,7 +2605,7 @@ private void SendSitResponse(IClientAPI remoteClient, UUID targetID, Vector3 off
                 SceneObjectPart rootPart = part.ParentGroup.RootPart;
                 vParentID = rootPart.UUID;         // parentID to send to viewer, always the root prim
                 vPos = Vector3.Zero;            // viewer position of avatar relative to root prim
-                vRot = Quaternion.Identity;  // viewer rotation of avatar relative to root prim
+                vRot = m_sitTargetCorrectionMode == SitTargetCorrectionMode.SecondLife ? rootPart.RotationOffset : Quaternion.Identity;  // viewer rotation of avatar relative to root prim
                 avSitPos = Vector3.Zero;
                 avSitRot = rootPart.RotationOffset;
 
@@ -2630,6 +2630,10 @@ private void SendSitResponse(IClientAPI remoteClient, UUID targetID, Vector3 off
                 {
                     avSitPos += sitInfo.Offset + m_sitTargetCorrectionPrimSpaceOffset + m_sitTargetCorrectionAgentSpaceOffset * sitInfo.Rotation;
                     avSitRot *= sitInfo.Rotation;
+                    if (m_sitTargetCorrectionMode == SitTargetCorrectionMode.SecondLife)
+                    {
+                        vPos += sitInfo.Offset + m_sitTargetCorrectionPrimSpaceOffset + m_sitTargetCorrectionAgentSpaceOffset * sitInfo.Rotation;
+                    }
                     vRot *= sitInfo.Rotation;
                 }
                 else