Merge branch 'master' into careminster
commit
86ded35afa
|
@ -1696,6 +1696,10 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
if (ParentGroup != null)
|
||||
ParentGroup.HasGroupChanged = true;
|
||||
|
||||
PhysicsActor pa = PhysActor;
|
||||
if (pa != null)
|
||||
pa.Density = Density;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1715,6 +1719,9 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
if (ParentGroup != null)
|
||||
ParentGroup.HasGroupChanged = true;
|
||||
|
||||
PhysicsActor pa = PhysActor;
|
||||
if (pa != null)
|
||||
pa.GravModifier = GravityModifier;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1733,6 +1740,10 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
if (ParentGroup != null)
|
||||
ParentGroup.HasGroupChanged = true;
|
||||
|
||||
PhysicsActor pa = PhysActor;
|
||||
if (pa != null)
|
||||
pa.Friction = Friction;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1751,6 +1762,10 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
if (ParentGroup != null)
|
||||
ParentGroup.HasGroupChanged = true;
|
||||
|
||||
PhysicsActor pa = PhysActor;
|
||||
if (pa != null)
|
||||
pa.Restitution = Restitution;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -4658,6 +4673,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
pa.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info
|
||||
pa.SetMaterial(Material);
|
||||
|
||||
pa.Density = Density;
|
||||
pa.GravModifier = GravityModifier;
|
||||
pa.Friction = Friction;
|
||||
pa.Restitution = Restitution;
|
||||
|
||||
if (VolumeDetectActive) // change if not the default only
|
||||
pa.SetVolumeDetect(1);
|
||||
|
||||
|
|
Loading…
Reference in New Issue