aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-20 18:28:30 +0000
committerJustin Clarke Casey2008-11-20 18:28:30 +0000
commitd6250959597fceec30f1df6355970f385cfd4742 (patch)
tree562313ca0024c40e5266ac00d23a7360d476abfb /OpenSim/Region/Environment
parent* Temporarily check in a test log4net config file to see if that reveals why ... (diff)
downloadopensim-SC-d6250959597fceec30f1df6355970f385cfd4742.zip
opensim-SC-d6250959597fceec30f1df6355970f385cfd4742.tar.gz
opensim-SC-d6250959597fceec30f1df6355970f385cfd4742.tar.bz2
opensim-SC-d6250959597fceec30f1df6355970f385cfd4742.tar.xz
* Allow physics dlls to be loaded separately, rather than just the contents of bin/Physics
* This is primarily to see if not loading ODE in the unit tests will allow them to proceed, though the option of separate loading is probably a good thing in itself
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs9
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs2
2 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
index 81d88e2..66ea59e 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
@@ -83,5 +83,14 @@ namespace OpenSim.Region.Environment.Scenes.Tests
83 83
84 Assert.That(retrievedPart, Is.Null); 84 Assert.That(retrievedPart, Is.Null);
85 } 85 }
86
87 /// <summary>
88 /// Test removing an object
89 /// </summary>
90 public void TestRemoveSceneObjectAsync()
91 {
92 TestScene scene = SceneTestUtils.SetupScene();
93 SceneObjectPart part = SceneTestUtils.AddSceneObject(scene);
94 }
86 } 95 }
87} \ No newline at end of file 96} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
index 1cdd32c..289bf87 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
63 testScene.LandChannel = new TestLandChannel(); 63 testScene.LandChannel = new TestLandChannel();
64 64
65 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); 65 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
66 physicsPluginManager.LoadPlugins(); 66 physicsPluginManager.LoadPlugin("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
67 testScene.PhysicsScene = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", configSource); 67 testScene.PhysicsScene = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", configSource);
68 68
69 return testScene; 69 return testScene;