aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRobert Adams2011-07-14 12:38:35 -0700
committerDan Lake2011-07-15 11:37:34 -0700
commitb55076990c3ba27bc9a0ca716031928fae887deb (patch)
tree4fc417a71995c9ead9dd19ea2a7ffabe53a3ac96 /OpenSim
parentminor: remove whitespace (diff)
downloadopensim-SC_OLD-b55076990c3ba27bc9a0ca716031928fae887deb.zip
opensim-SC_OLD-b55076990c3ba27bc9a0ca716031928fae887deb.tar.gz
opensim-SC_OLD-b55076990c3ba27bc9a0ca716031928fae887deb.tar.bz2
opensim-SC_OLD-b55076990c3ba27bc9a0ca716031928fae887deb.tar.xz
fix duplication of physical objects for physics engines that care about the initial value of localID
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 905acd6..343a8fd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1463,16 +1463,16 @@ namespace OpenSim.Region.Framework.Scenes
1463 // Need to duplicate the physics actor as well 1463 // Need to duplicate the physics actor as well
1464 if (part.PhysActor != null && userExposed) 1464 if (part.PhysActor != null && userExposed)
1465 { 1465 {
1466 PrimitiveBaseShape pbs = part.Shape; 1466 PrimitiveBaseShape pbs = newPart.Shape;
1467 1467
1468 newPart.PhysActor 1468 newPart.PhysActor
1469 = m_scene.PhysicsScene.AddPrimShape( 1469 = m_scene.PhysicsScene.AddPrimShape(
1470 part.LocalId, 1470 newPart.LocalId,
1471 string.Format("{0}/{1}", part.Name, part.UUID), 1471 string.Format("{0}/{1}", newPart.Name, newPart.UUID),
1472 pbs, 1472 pbs,
1473 part.AbsolutePosition, 1473 newPart.AbsolutePosition,
1474 part.Scale, 1474 newPart.Scale,
1475 part.RotationOffset, 1475 newPart.RotationOffset,
1476 part.PhysActor.IsPhysical); 1476 part.PhysActor.IsPhysical);
1477 1477
1478 newPart.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true); 1478 newPart.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true);