aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs13
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 8ad8147..579ec90 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -531,7 +531,9 @@ namespace OpenSim.Region.Environment.Scenes
531 AddEntityFromStorage(prim); 531 AddEntityFromStorage(prim);
532 SceneObjectPart rootPart = prim.GetChildPart(prim.UUID); 532 SceneObjectPart rootPart = prim.GetChildPart(prim.UUID);
533 if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) 533 if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0)
534 rootPart.PhysActor = phyScene.AddPrim( 534 rootPart.PhysActor = phyScene.AddPrimShape(
535 rootPart.Name,
536 rootPart.Shape,
535 new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, 537 new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y,
536 rootPart.AbsolutePosition.Z), 538 rootPart.AbsolutePosition.Z),
537 new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), 539 new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z),
@@ -579,7 +581,10 @@ namespace OpenSim.Region.Environment.Scenes
579 // if not phantom, add to physics 581 // if not phantom, add to physics
580 if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) 582 if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0)
581 rootPart.PhysActor = 583 rootPart.PhysActor =
582 phyScene.AddPrim(new PhysicsVector(pos.X, pos.Y, pos.Z), 584 phyScene.AddPrimShape(
585 rootPart.Name,
586 rootPart.Shape,
587 new PhysicsVector(pos.X, pos.Y, pos.Z),
583 new PhysicsVector(shape.Scale.X, shape.Scale.Y, shape.Scale.Z), 588 new PhysicsVector(shape.Scale.X, shape.Scale.Y, shape.Scale.Z),
584 new Quaternion()); 589 new Quaternion());
585 } 590 }
@@ -662,7 +667,9 @@ namespace OpenSim.Region.Environment.Scenes
662 667
663 SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); 668 SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
664 if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) 669 if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0)
665 rootPart.PhysActor = phyScene.AddPrim( 670 rootPart.PhysActor = phyScene.AddPrimShape(
671 rootPart.Name,
672 rootPart.Shape,
666 new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, 673 new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y,
667 rootPart.AbsolutePosition.Z), 674 rootPart.AbsolutePosition.Z),
668 new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), 675 new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z),