Merge branch 'tests'

avinationmerge
Kitto Flora 2009-12-16 18:59:46 -05:00
commit 83fad75e22
1 changed files with 8 additions and 2 deletions

View File

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