aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-11-23 01:35:08 +0000
committerJustin Clark-Casey (justincc)2013-11-23 01:35:08 +0000
commit78649eb0999a5f97cc541c94ec98d1d06ed957cb (patch)
treeeda295076db783d34624f1ccc407907e5186839f /OpenSim/Region
parentFix non-root prim sit positions for prims where a sit target has been specifi... (diff)
downloadopensim-SC_OLD-78649eb0999a5f97cc541c94ec98d1d06ed957cb.zip
opensim-SC_OLD-78649eb0999a5f97cc541c94ec98d1d06ed957cb.tar.gz
opensim-SC_OLD-78649eb0999a5f97cc541c94ec98d1d06ed957cb.tar.bz2
opensim-SC_OLD-78649eb0999a5f97cc541c94ec98d1d06ed957cb.tar.xz
Refix fix for sitting on non-root linked prims with explicit sit targets.
I forgot that m_post is being set inconsistently between non-explicit and explicit ragets
Diffstat (limited to 'OpenSim/Region')
-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 127ad40..c88025c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2590,7 +2590,7 @@ namespace OpenSim.Region.Framework.Scenes
2590 2590
2591 //Quaternion result = (sitTargetOrient * vq) * nq; 2591 //Quaternion result = (sitTargetOrient * vq) * nq;
2592 2592
2593 m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - part.GroupPosition; 2593 m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT + part.OffsetPosition;
2594 Rotation = sitTargetOrient; 2594 Rotation = sitTargetOrient;
2595 ParentPosition = part.AbsolutePosition; 2595 ParentPosition = part.AbsolutePosition;
2596 } 2596 }