diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODETestClass.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs index 94d98cb..bdc5b00 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using Axiom.Math; | 29 | using Axiom.Math; |
30 | using Nini.Config; | ||
30 | using NUnit.Framework; | 31 | using NUnit.Framework; |
31 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
32 | using OpenSim.Region.Physics.Manager; | 33 | using OpenSim.Region.Physics.Manager; |
@@ -50,7 +51,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
50 | // Getting Physics Scene | 51 | // Getting Physics Scene |
51 | ps = cbt.GetScene(); | 52 | ps = cbt.GetScene(); |
52 | // Initializing Physics Scene. | 53 | // Initializing Physics Scene. |
53 | ps.Initialise(imp.GetMesher()); | 54 | ps.Initialise(imp.GetMesher(),null); |
54 | float[] _heightmap = new float[256 * 256]; | 55 | float[] _heightmap = new float[256 * 256]; |
55 | for (int i = 0; i<(256*256);i++) | 56 | for (int i = 0; i<(256*256);i++) |
56 | { | 57 | { |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index c2a1c8e..da72092 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -32,6 +32,7 @@ using System.Runtime.InteropServices; | |||
32 | using System.Threading; | 32 | using System.Threading; |
33 | using Axiom.Math; | 33 | using Axiom.Math; |
34 | using log4net; | 34 | using log4net; |
35 | using Nini.Config; | ||
35 | using Ode.NET; | 36 | using Ode.NET; |
36 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
37 | using OpenSim.Region.Physics.Manager; | 38 | using OpenSim.Region.Physics.Manager; |
@@ -193,6 +194,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
193 | 194 | ||
194 | public IMesher mesher; | 195 | public IMesher mesher; |
195 | 196 | ||
197 | private IConfigSource m_config; | ||
198 | |||
196 | 199 | ||
197 | /// <summary> | 200 | /// <summary> |
198 | /// Initiailizes the scene | 201 | /// Initiailizes the scene |
@@ -286,9 +289,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
286 | 289 | ||
287 | 290 | ||
288 | // Initialize the mesh plugin | 291 | // Initialize the mesh plugin |
289 | public override void Initialise(IMesher meshmerizer) | 292 | public override void Initialise(IMesher meshmerizer, IConfigSource config) |
290 | { | 293 | { |
291 | mesher = meshmerizer; | 294 | mesher = meshmerizer; |
295 | m_config = config; | ||
292 | } | 296 | } |
293 | 297 | ||
294 | internal void waitForSpaceUnlock(IntPtr space) | 298 | internal void waitForSpaceUnlock(IntPtr space) |