aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-04-03 23:20:37 +0100
committerJustin Clark-Casey (justincc)2014-04-03 23:22:57 +0100
commitaec723b9552322fd29413086be223e38298df92f (patch)
treea85e0ecb32c161cdb507fb2d0c774d5d577b4ce8 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentremove some whitespace that snuck in with last patch (diff)
downloadopensim-SC-aec723b9552322fd29413086be223e38298df92f.zip
opensim-SC-aec723b9552322fd29413086be223e38298df92f.tar.gz
opensim-SC-aec723b9552322fd29413086be223e38298df92f.tar.bz2
opensim-SC-aec723b9552322fd29413086be223e38298df92f.tar.xz
Fix sp.AbsolutePosition when agent is sitting on a child prim, which in turns fixes llDetectedPos(), llGetLinkPrimitiveParams() and similar functions.
Add regression test for this case. In relation to http://opensimulator.org/mantis/view.php?id=7043
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-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 a0b4019..6e613a7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -538,7 +538,7 @@ namespace OpenSim.Region.Framework.Scenes
538 SceneObjectPart sitPart = ParentPart; 538 SceneObjectPart sitPart = ParentPart;
539 539
540 if (sitPart != null) 540 if (sitPart != null)
541 return sitPart.AbsolutePosition + (m_pos * sitPart.GetWorldRotation()); 541 return sitPart.ParentGroup.AbsolutePosition + (m_pos * sitPart.GetWorldRotation());
542 } 542 }
543 543
544 return m_pos; 544 return m_pos;