diff options
author | Robert Adams | 2015-09-08 06:15:46 -0700 |
---|---|---|
committer | Robert Adams | 2015-09-08 06:15:46 -0700 |
commit | 4dd17c4117ea413fb0c4418511956cb3abfe258c (patch) | |
tree | 6f31a583610f8bf074d1f0b4e7ab6ccef37dec9a /OpenSim/Region/PhysicsModules/Ode | |
parent | Merge of ubitworkvarnew with opensim/master as of 20150905. (diff) | |
download | opensim-SC_OLD-4dd17c4117ea413fb0c4418511956cb3abfe258c.zip opensim-SC_OLD-4dd17c4117ea413fb0c4418511956cb3abfe258c.tar.gz opensim-SC_OLD-4dd17c4117ea413fb0c4418511956cb3abfe258c.tar.bz2 opensim-SC_OLD-4dd17c4117ea413fb0c4418511956cb3abfe258c.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/PhysicsModules/Ode')
-rw-r--r-- | OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
671 | } | 671 | } |
672 | #endif | 672 | #endif |
673 | 673 | ||
674 | public override void Initialise(IMesher meshmerizer, IConfigSource config, Vector3 regionExtent) | 674 | public void Initialise(IMesher meshmerizer, IConfigSource config, Vector3 regionExtent) |
675 | { | 675 | { |
676 | WorldExtents.X = regionExtent.X; | 676 | WorldExtents.X = regionExtent.X; |
677 | m_regionWidth = (uint)regionExtent.X; | 677 | m_regionWidth = (uint)regionExtent.X; |
@@ -682,7 +682,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
682 | } | 682 | } |
683 | 683 | ||
684 | // Initialize the mesh plugin | 684 | // Initialize the mesh plugin |
685 | public override void Initialise(IMesher meshmerizer, IConfigSource config) | 685 | public void Initialise(IMesher meshmerizer, IConfigSource config) |
686 | { | 686 | { |
687 | InitializeExtraStats(); | 687 | InitializeExtraStats(); |
688 | 688 | ||