From 28ea08c3e234f8ca3c6590af4045349af7fed844 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 11 Dec 2012 17:14:32 +0000
Subject:  fix let other phys plugins work.. broken when added feetOffset

---
 OpenSim/Region/Physics/Manager/PhysicsScene.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')

diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index c07213e..cdffa6b 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -147,15 +147,9 @@ namespace OpenSim.Region.Physics.Manager
             return ret;
         }
 
-        public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size,float feetOffset, bool isFlying)
+        public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
         {
-            return null;
-        }
-
-        public virtual PhysicsActor AddAvatar(uint localID,string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
-        {
-            PhysicsActor ret = AddAvatar(avName, position, size,feetOffset, isFlying);
-            if (ret != null) ret.LocalID = localID;
+            PhysicsActor ret = AddAvatar(localID, avName, position, size, isFlying);
             return ret;
         }
 
-- 
cgit v1.1