From 71d221cdc090cdedf371ead534421bb7074908cd Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 18 Oct 2011 17:35:58 +0100 Subject: Remove the unused CollisionLocker from ODE Despite its name, this wasn't actually being used in any collision checking --- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs') diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index ebd46ab..716161a 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs @@ -48,14 +48,8 @@ namespace OpenSim.Region.Physics.OdePlugin { //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - private CollisionLocker m_ode; private OdeScene m_scene; - public OdePlugin() - { - m_ode = new CollisionLocker(); - } - public bool Init() { return true; @@ -69,7 +63,7 @@ namespace OpenSim.Region.Physics.OdePlugin // http://opensimulator.org/mantis/view.php?id=2750). d.InitODE(); - m_scene = new OdeScene(m_ode, sceneIdentifier); + m_scene = new OdeScene(sceneIdentifier); } return (m_scene); } -- cgit v1.1