OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'tests'

avinationmerge
Kitto Flora 2009-12-16 18:59:46 -05:00
parent f8b6bc8d11 7cd44c1a81
commit 83fad75e22
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -513,6 +513,12 @@ namespace OpenSim.Region.Framework.Scenes
{ {
// If this is a linkset, we don't want the physics engine mucking up our group position here. // If this is a linkset, we don't want the physics engine mucking up our group position here.
PhysicsActor actor = PhysActor; PhysicsActor actor = PhysActor;
if (actor != null && _parentID == 0)
{
m_groupPosition = actor.Position;
}
/*
if (actor != null) if (actor != null)
{ {
if (_parentID == 0) if (_parentID == 0)
@ -524,7 +530,7 @@ namespace OpenSim.Region.Framework.Scenes
m_groupPosition = ParentGroup.AbsolutePosition; // KF+Casper Update Child prims too! m_groupPosition = ParentGroup.AbsolutePosition; // KF+Casper Update Child prims too!
} }
} }
*/
if (IsAttachment) if (IsAttachment)
{ {
ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar); ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar);