aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a215b20..c6d8c73 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1582,6 +1582,7 @@ namespace OpenSim.Region.Framework.Scenes
1582 if (!isPhantom && !IsAttachment && !(Shape.PathCurve == (byte) Extrusion.Flexible)) 1582 if (!isPhantom && !IsAttachment && !(Shape.PathCurve == (byte) Extrusion.Flexible))
1583 { 1583 {
1584 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( 1584 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
1585 LocalId,
1585 string.Format("{0}/{1}", Name, UUID), 1586 string.Format("{0}/{1}", Name, UUID),
1586 Shape, 1587 Shape,
1587 AbsolutePosition, 1588 AbsolutePosition,
@@ -1594,7 +1595,6 @@ namespace OpenSim.Region.Framework.Scenes
1594 { 1595 {
1595 PhysActor.SOPName = this.Name; // save object name and desc into the PhysActor so ODE internals know the joint/body info 1596 PhysActor.SOPName = this.Name; // save object name and desc into the PhysActor so ODE internals know the joint/body info
1596 PhysActor.SOPDescription = this.Description; 1597 PhysActor.SOPDescription = this.Description;
1597 PhysActor.LocalID = LocalId;
1598 DoPhysicsPropertyUpdate(RigidBody, true); 1598 DoPhysicsPropertyUpdate(RigidBody, true);
1599 PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); 1599 PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0);
1600 } 1600 }
@@ -4410,6 +4410,7 @@ namespace OpenSim.Region.Framework.Scenes
4410 { 4410 {
4411 // It's not phantom anymore. So make sure the physics engine get's knowledge of it 4411 // It's not phantom anymore. So make sure the physics engine get's knowledge of it
4412 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( 4412 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
4413 LocalId,
4413 string.Format("{0}/{1}", Name, UUID), 4414 string.Format("{0}/{1}", Name, UUID),
4414 Shape, 4415 Shape,
4415 AbsolutePosition, 4416 AbsolutePosition,
@@ -4420,7 +4421,6 @@ namespace OpenSim.Region.Framework.Scenes
4420 pa = PhysActor; 4421 pa = PhysActor;
4421 if (pa != null) 4422 if (pa != null)
4422 { 4423 {
4423 pa.LocalID = LocalId;
4424 DoPhysicsPropertyUpdate(UsePhysics, true); 4424 DoPhysicsPropertyUpdate(UsePhysics, true);
4425 if (m_parentGroup != null) 4425 if (m_parentGroup != null)
4426 { 4426 {