Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge

This commit is contained in:
Melanie
2011-10-25 01:52:54 +01:00
3 changed files with 19 additions and 11 deletions

View File

@@ -536,10 +536,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
so.AttachedAvatar = sp.UUID;
if (so.RootPart.PhysActor != null)
{
m_scene.PhysicsScene.RemovePrim(so.RootPart.PhysActor);
so.RootPart.PhysActor = null;
}
so.RootPart.RemoveFromPhysics();
so.AbsolutePosition = attachOffset;
so.RootPart.AttachedPos = attachOffset;