From a0265300aa09be0bdd2d4629d6a22394d5b219be Mon Sep 17 00:00:00 2001
From: dan miller
Date: Sat, 29 Sep 2007 03:56:36 +0000
Subject: Hollow prims (box only), thanks Gerard!  Enjoy

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')

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
                 AddEntityFromStorage(prim);
                 SceneObjectPart rootPart = prim.GetChildPart(prim.UUID);
                 if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0)
-                    rootPart.PhysActor = phyScene.AddPrim(
+                    rootPart.PhysActor = phyScene.AddPrimShape(
+                        rootPart.Name,
+                        rootPart.Shape,
                         new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y,
                                           rootPart.AbsolutePosition.Z),
                         new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z),
@@ -579,7 +581,10 @@ namespace OpenSim.Region.Environment.Scenes
                 // if not phantom, add to physics
                 if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0)
                     rootPart.PhysActor =
-                        phyScene.AddPrim(new PhysicsVector(pos.X, pos.Y, pos.Z),
+                        phyScene.AddPrimShape(
+                                         rootPart.Name,
+                                         rootPart.Shape,
+                                         new PhysicsVector(pos.X, pos.Y, pos.Z),
                                          new PhysicsVector(shape.Scale.X, shape.Scale.Y, shape.Scale.Z),
                                          new Quaternion());
             }
@@ -662,7 +667,9 @@ namespace OpenSim.Region.Environment.Scenes
 
                     SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
                     if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0)
-                        rootPart.PhysActor = phyScene.AddPrim(
+                        rootPart.PhysActor = phyScene.AddPrimShape(
+                            rootPart.Name,
+                            rootPart.Shape,
                             new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y,
                                               rootPart.AbsolutePosition.Z),
                             new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z),
-- 
cgit v1.1