From bb402d0d95c934fbcd8b1c03e228ec1d0a14f14d Mon Sep 17 00:00:00 2001
From: Tom
Date: Fri, 15 Jul 2011 12:08:40 -0700
Subject: Add localid support to ch0de properly

---
 OpenSim/Region/Physics/Manager/PhysicsScene.cs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/Physics/Manager')

diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 13ea084..de22fae 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -77,15 +77,16 @@ namespace OpenSim.Region.Physics.Manager
 
         public abstract void RemovePrim(PhysicsActor prim);
 
+        //public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
+        //                                          Vector3 size, Quaternion rotation); //To be removed - Actually removed!
+
         public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
-                                                  Vector3 size, Quaternion rotation); //To be removed
-        public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
-                                                  Vector3 size, Quaternion rotation, bool isPhysical);
+                                                  Vector3 size, Quaternion rotation, bool isPhysical, uint localid);
 
         public virtual PhysicsActor AddPrimShape(uint localID, string primName, PrimitiveBaseShape pbs, Vector3 position,
-                                                  Vector3 size, Quaternion rotation, bool isPhysical)
+                                                  Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
         {
-            PhysicsActor ret = AddPrimShape(primName, pbs, position, size, rotation, isPhysical);
+            PhysicsActor ret = AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid);
 
             if (ret != null)
                 ret.LocalID = localID;
@@ -262,13 +263,7 @@ namespace OpenSim.Region.Physics.Manager
 */
 
             public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
-                                                      Vector3 size, Quaternion rotation) //To be removed
-            {
-                return AddPrimShape(primName, pbs, position, size, rotation, false);
-            }
-
-            public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
-                                                      Vector3 size, Quaternion rotation, bool isPhysical)
+                                                      Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
             {
                 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size);
                 return PhysicsActor.Null;
-- 
cgit v1.1