aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-11-23 02:09:03 +0000
committerJustin Clark-Casey (justincc)2013-11-23 02:09:03 +0000
commit65304260af283211443a2872c46f6609d3e45649 (patch)
treee32e84408c3051541eed70ace4fdbdfe88bcc79f
parentRemove old *.exe.config files that related to programs that have long been de... (diff)
downloadopensim-SC_OLD-65304260af283211443a2872c46f6609d3e45649.zip
opensim-SC_OLD-65304260af283211443a2872c46f6609d3e45649.tar.gz
opensim-SC_OLD-65304260af283211443a2872c46f6609d3e45649.tar.bz2
opensim-SC_OLD-65304260af283211443a2872c46f6609d3e45649.tar.xz
fix avatar rotation when sitting on a linked part
Need to take into account rotation of linked prim now that we are always specifying sits wrt the root prim
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c88025c..7a1017f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2591,7 +2591,7 @@ namespace OpenSim.Region.Framework.Scenes
2591 //Quaternion result = (sitTargetOrient * vq) * nq; 2591 //Quaternion result = (sitTargetOrient * vq) * nq;
2592 2592
2593 m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT + part.OffsetPosition; 2593 m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT + part.OffsetPosition;
2594 Rotation = sitTargetOrient; 2594 Rotation = part.RotationOffset * sitTargetOrient;
2595 ParentPosition = part.AbsolutePosition; 2595 ParentPosition = part.AbsolutePosition;
2596 } 2596 }
2597 else 2597 else