aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a23c11e..778e384 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -513,18 +513,24 @@ namespace OpenSim.Region.Framework.Scenes
513 { 513 {
514 // If this is a linkset, we don't want the physics engine mucking up our group position here. 514 // If this is a linkset, we don't want the physics engine mucking up our group position here.
515 PhysicsActor actor = PhysActor; 515 PhysicsActor actor = PhysActor;
516
517 if (actor != null && _parentID == 0)
518 {
519 m_groupPosition = actor.Position;
520 }
521/*
516 if (actor != null) 522 if (actor != null)
517 { 523 {
518 if (_parentID == 0) 524 if (_parentID == 0)
519 { 525 {
520 m_groupPosition = actor.Position; 526 m_groupPosition = actor.Position;
521 } 527 }
522 else 528 else
523 { 529 {
524 m_groupPosition = ParentGroup.AbsolutePosition; // KF+Casper Update Child prims too! 530 m_groupPosition = ParentGroup.AbsolutePosition; // KF+Casper Update Child prims too!
525 } 531 }
526 } 532 }
527 533*/
528 if (IsAttachment) 534 if (IsAttachment)
529 { 535 {
530 ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar); 536 ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar);