aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin
diff options
context:
space:
mode:
authorMelanie2010-09-26 17:56:31 +0100
committerMelanie2010-09-26 17:56:31 +0100
commit6f689f591a295195cf8db3c37bcd382502d468d7 (patch)
tree87d7340eb92921c905a505cf89dd4a37d90ac381 /OpenSim/Region/Physics/OdePlugin
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-6f689f591a295195cf8db3c37bcd382502d468d7.zip
opensim-SC-6f689f591a295195cf8db3c37bcd382502d468d7.tar.gz
opensim-SC-6f689f591a295195cf8db3c37bcd382502d468d7.tar.bz2
opensim-SC-6f689f591a295195cf8db3c37bcd382502d468d7.tar.xz
Merge Master
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
index 69e2d03..ab8f8bf 100644
--- a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
+++ b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
@@ -48,6 +48,10 @@ namespace OpenSim.Region.Physics.OdePlugin
48 [SetUp] 48 [SetUp]
49 public void Initialize() 49 public void Initialize()
50 { 50 {
51 IConfigSource TopConfig = new IniConfigSource();
52 IConfig config = TopConfig.AddConfig("Startup");
53 config.Set("DecodedSculpMapPath","j2kDecodeCache");
54
51 // Loading ODEPlugin 55 // Loading ODEPlugin
52 cbt = new OdePlugin(); 56 cbt = new OdePlugin();
53 // Loading Zero Mesher 57 // Loading Zero Mesher
@@ -55,7 +59,7 @@ namespace OpenSim.Region.Physics.OdePlugin
55 // Getting Physics Scene 59 // Getting Physics Scene
56 ps = cbt.GetScene("test"); 60 ps = cbt.GetScene("test");
57 // Initializing Physics Scene. 61 // Initializing Physics Scene.
58 ps.Initialise(imp.GetMesher(),null); 62 ps.Initialise(imp.GetMesher(TopConfig),null);
59 float[] _heightmap = new float[(int)Constants.RegionSize * (int)Constants.RegionSize]; 63 float[] _heightmap = new float[(int)Constants.RegionSize * (int)Constants.RegionSize];
60 for (int i = 0; i < ((int)Constants.RegionSize * (int)Constants.RegionSize); i++) 64 for (int i = 0; i < ((int)Constants.RegionSize * (int)Constants.RegionSize); i++)
61 { 65 {