Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge

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

3 files changed, 3 insertions, 15 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index fae1618..5381f63 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -493,8 +493,8 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     foreach (ScenePresence av in m_linkedAvatars)
                     {
-                        SceneObjectPart p;
-                        if (m_parts.TryGetValue(av.LinkedPrim, out p))
+                        SceneObjectPart p = m_scene.GetSceneObjectPart(av.ParentID);
+                        if (m_parts.TryGetValue(p.UUID, out p))
                         {
                             Vector3 offset = p.GetWorldPosition() - av.ParentPosition;
                             av.AbsolutePosition += offset;
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
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index bdfad40..bb65322 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -671,19 +671,12 @@ namespace OpenSim.Region.Framework.Scenes
         private uint m_parentID;
 
 
-        private UUID m_linkedPrim;
-
         public uint ParentID
         {
             get { return m_parentID; }
             set { m_parentID = value; }
         }
 
-        public UUID LinkedPrim
-        {
-            get { return m_linkedPrim; }
-            set { m_linkedPrim = value; }
-        }
 
         public float Health
         {
@@ -2056,7 +2049,6 @@ namespace OpenSim.Region.Framework.Scenes
                 
                         m_parentPosition = Vector3.Zero;
                                 m_parentID = 0;
-                m_linkedPrim = UUID.Zero;
                 m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
                 SendAvatarDataToAllAgents();
                 m_requestedSitTargetID = 0;
@@ -2513,7 +2505,6 @@ namespace OpenSim.Region.Framework.Scenes
         }
         */
 
-
         public void HandleAgentSit(IClientAPI remoteClient, UUID agentID)
         {
             if (!String.IsNullOrEmpty(m_nextSitAnimation))
@@ -2616,7 +2607,6 @@ namespace OpenSim.Region.Framework.Scenes
                 m_parentID = m_requestedSitTargetID;
             }
 
-            m_linkedPrim = part.UUID;
             if (part.GetAvatarOnSitTarget() != UUID)
             {
                 m_offsetRotation = m_offsetRotation / part.RotationOffset;