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

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

@ -2184,12 +2184,6 @@ namespace OpenSim.Region.Framework.Scenes
PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate; PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
PhysActor.OnOutOfBounds += PhysicsOutOfBounds; PhysActor.OnOutOfBounds += PhysicsOutOfBounds;
if (ParentID != 0 && ParentID != LocalId)
{
ParentGroup.Scene.AddPhysicalPrim(1);
pa.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
pa.OnOutOfBounds += PhysicsOutOfBounds;
if (ParentID != 0 && ParentID != LocalId) if (ParentID != 0 && ParentID != LocalId)
{ {
PhysicsActor parentPa = ParentGroup.RootPart.PhysActor; PhysicsActor parentPa = ParentGroup.RootPart.PhysActor;
@ -2201,7 +2195,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
}
bool phan = ((Flags & PrimFlags.Phantom) != 0); bool phan = ((Flags & PrimFlags.Phantom) != 0);
if (PhysActor.Phantom != phan) if (PhysActor.Phantom != phan)