From 4c10826caa4b2b19200ab3f0272bb1c20c26c53e Mon Sep 17 00:00:00 2001 From: KittoFlora Date: Mon, 16 Nov 2009 02:12:56 +0100 Subject: Fix merge conflicts --- OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 7 ------- 1 file changed, 7 deletions(-) (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs') diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index b963d65..8f2c801 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs @@ -107,17 +107,10 @@ namespace OpenSim.Region.Physics.OdePlugin private float m_PIDHoverTau; private bool m_useHoverPID; private PIDHoverType m_PIDHoverType = PIDHoverType.Ground; -<<<<<<< HEAD:OpenSim/Region/Physics/OdePlugin/ODEPrim.cs - private float m_targetHoverHeight = 0f; - private float m_groundHeight = 0f; - private float m_waterHeight = 0f; - private float m_buoyancy = 0f; //Set by llSetBuoyancy(), for non-vehicles. -======= private float m_targetHoverHeight; private float m_groundHeight; private float m_waterHeight; private float m_buoyancy; //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle. ->>>>>>> vehicles:OpenSim/Region/Physics/OdePlugin/ODEPrim.cs // private float m_tensor = 5f; private int body_autodisable_frames = 20; -- cgit v1.1