Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
This commit is contained in:
Melanie
2011-10-11 22:11:44 +01:00
4 changed files with 24 additions and 7 deletions

View File

@@ -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();
}
}