Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge

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

1 files changed, 1 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index d7435c6..89b98af 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -776,7 +776,7 @@ namespace OpenSim.Region.Framework.Scenes
                         List<ScenePresence> avs = ParentGroup.GetLinkedAvatars();
                         foreach (ScenePresence av in avs)
                         {
-                            if (av.LinkedPrim == m_uuid)
+                            if (av.ParentID == m_localId)
                             {
                                 Vector3 offset = (m_offsetPosition - oldpos);
                                 av.AbsolutePosition += offset;
@@ -1260,14 +1260,12 @@ namespace OpenSim.Region.Framework.Scenes
                 set { m_occupied = value; }
         }
 
-        
         public UUID SitTargetAvatar
         {
             get { return m_sitTargetAvatar; }
             set { m_sitTargetAvatar = value; }
         }
 
-        
         public virtual UUID RegionID
         {
             get