Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

1 files changed, 1 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 5414693..97722b7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -804,7 +804,7 @@ namespace OpenSim.Region.Framework.Scenes
                             if (av.LinkedPrim == m_uuid)
                             {
                                 Vector3 offset = (m_offsetPosition - oldpos);
-                                av.OffsetPosition += offset;
+                                av.AbsolutePosition += offset;
                                 av.SendAvatarDataToAllAgents();
                             }
                         }