From 7cd44c1a818615ca0e267f64c74593ad0361350b Mon Sep 17 00:00:00 2001
From: Kitto Flora <kitto@meta7.com>
Date: Tue, 15 Dec 2009 20:04:53 -0500
Subject: [PATCH] Fix prim linking bug, Manis #14

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a23c11e123..778e38429a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -513,18 +513,24 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 // If this is a linkset, we don't want the physics engine mucking up our group position here.
                 PhysicsActor actor = PhysActor;
+                
+                if (actor != null && _parentID == 0)
+                {
+                    m_groupPosition = actor.Position;
+                }                
+/*                
                 if (actor != null) 
                 {
                 	if (_parentID == 0)
                 	{
-                    	m_groupPosition = actor.Position;
+	                   	m_groupPosition = actor.Position;
                 	}
                 	else
                 	{
                 		m_groupPosition = ParentGroup.AbsolutePosition;  // KF+Casper Update Child prims too!
                 	}
                 }
-
+*/
                 if (IsAttachment)
                 {
                     ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar);