Revert "Add localid support to ch0de properly"

This reverts commit bb402d0d95c934fbcd8b1c03e228ec1d0a14f14d.

1 files changed, 12 insertions, 7 deletions

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