Merge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmerge

1 files changed, 1 insertions, 7 deletions

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);
         }