From 3270bd560e29fcc871cab6e99a504903eef7af0e Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Wed, 20 Jul 2011 14:34:02 -0700
Subject: Removed unused AddPrimShape methods in PhysicsScene caused by merge
 conflicts

---
 OpenSim/Region/Physics/Manager/PhysicsScene.cs | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 28ace34..3870411 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -88,23 +88,9 @@ 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);
 
-        public virtual PhysicsActor AddPrimShape(uint localID, string primName, PrimitiveBaseShape pbs, Vector3 position,
-                                                  Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
-        {
-            PhysicsActor ret = AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid);
-
-            if (ret != null)
-                ret.LocalID = localID;
-
-            return ret;
-        }
-
         public virtual float TimeDilation
         {
             get { return 1.0f; }
-- 
cgit v1.1