From 4dd17c4117ea413fb0c4418511956cb3abfe258c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 8 Sep 2015 06:15:46 -0700
Subject: More 'everything is a module' merging. Have most of UbitOde
 converted. There are compile errors in OpenSimBase as the new modules stuff
 is not all there. Removed ChOdePlugin as it's connection to OdePlugin was
 tangled.

---
 OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/PhysicsModules/Ode')

diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
index 26210d6..b00a5ab 100644
--- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
@@ -671,7 +671,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
         }
 #endif
 
-        public override void Initialise(IMesher meshmerizer, IConfigSource config, Vector3 regionExtent)
+        public void Initialise(IMesher meshmerizer, IConfigSource config, Vector3 regionExtent)
         {
             WorldExtents.X = regionExtent.X;
             m_regionWidth = (uint)regionExtent.X;
@@ -682,7 +682,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
         }
 
         // Initialize the mesh plugin
-        public override void Initialise(IMesher meshmerizer, IConfigSource config)
+        public void Initialise(IMesher meshmerizer, IConfigSource config)
         {
             InitializeExtraStats();
 
-- 
cgit v1.1