From a11edceb00b5b86f825bd957bdac9edb91f893dd Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 2 Sep 2015 19:54:53 +0100
Subject: seems to compile ( tests comented out)

---
 OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'OpenSim/Region/Physics/OdePlugin/OdeScene.cs')

diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 7f4a809..3776ac9 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -2020,35 +2020,11 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         #region Add/Remove Entities
 
-<<<<<<< HEAD
         public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
         {                       
             OdeCharacter newAv
                 = new OdeCharacter(
                     avName, this, position, velocity, size, avPIDD, avPIDP,
-=======
-/*  core version
-        public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
-        {                       
-            OdeCharacter newAv
-                = new OdeCharacter(
-                    avName, this, position, velocity, size, avPIDD, avPIDP,
-                    avCapRadius, avStandupTensor, avDensity,
-                    avMovementDivisorWalk, avMovementDivisorRun);
-
-            newAv.Flying = isFlying;
-            newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset;
-            newAv.m_avatarplanted = avplanted;
-
-            return newAv;
-        }
-*/
-        public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
-        {
-            OdeCharacter newAv
-                = new OdeCharacter(
-                    avName, this, position, Vector3.Zero, size, avPIDD, avPIDP,
->>>>>>> avn/ubitvar
                     avCapRadius, avStandupTensor, avDensity,
                     avMovementDivisorWalk, avMovementDivisorRun);
 
-- 
cgit v1.1