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

remove more merge artefacts

avinationmerge
UbitUmarov 2012-04-04 17:01:29 +01:00
parent 787cc0d076
commit 867d50d14c
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2186,18 +2186,11 @@ namespace OpenSim.Region.Framework.Scenes
if (ParentID != 0 && ParentID != LocalId)
{
ParentGroup.Scene.AddPhysicalPrim(1);
PhysicsActor parentPa = ParentGroup.RootPart.PhysActor;
pa.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
pa.OnOutOfBounds += PhysicsOutOfBounds;
if (ParentID != 0 && ParentID != LocalId)
if (parentPa != null)
{
PhysicsActor parentPa = ParentGroup.RootPart.PhysActor;
if (parentPa != null)
{
pa.link(parentPa);
}
pa.link(parentPa);
}
}
}