From 1c0adfa6e025045b6c309943f886f641a4df8e38 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 23 Feb 2012 22:26:17 +0100
Subject: Correct sit position calculations

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 2e86315..f835e56 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4845,7 +4845,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     if (part != null && part != part.ParentGroup.RootPart)
                     {
                         position = part.OffsetPosition + presence.OffsetPosition * part.RotationOffset;
-                        rotation = presence.Rotation * part.RotationOffset;
+                        rotation = part.RotationOffset * presence.Rotation;
                     }
                 }
 
@@ -4974,7 +4974,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (part != null && part != part.ParentGroup.RootPart)
                 {
                     offsetPosition = part.OffsetPosition + data.OffsetPosition * part.RotationOffset;
-                    rotation = data.Rotation * part.RotationOffset;
+                    rotation = part.RotationOffset * data.Rotation;
                     parentID = part.ParentGroup.RootPart.LocalId;
                 }
             }
-- 
cgit v1.1