From 11194209df8a29f5103e6e34104eae7834f3280a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 31 Aug 2015 14:09:15 -0700
Subject: First commit where physics work as region module. Moved all physics
 dlls out of Physics and into bin directly, so they can be found by the module
 loader. Removed call to PhysicsPluginManager.

---
 OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 5 +----
 OpenSim/Tests/Common/Mock/TestScene.cs       | 4 ++--
 OpenSim/Tests/Common/OpenSimTestCase.cs      | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Tests/Common')

diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index a26e844..27705bd 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -151,12 +151,9 @@ namespace OpenSim.Tests.Common
             PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
             physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.PhysicsModule.BasicPhysics.dll");
             Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ);
-            PhysicsScene physicsScene 
-                = physicsPluginManager.GetPhysicsScene(
-                    "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent);
 
             TestScene testScene = new TestScene(
-                regInfo, m_acm, physicsScene, SimDataService, m_estateDataService, configSource, null);
+                regInfo, m_acm, SimDataService, m_estateDataService, configSource, null);
 
             INonSharedRegionModule godsModule = new GodsModule();
             godsModule.Initialise(new IniConfigSource());
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 08cfff2..951f103 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -41,10 +41,10 @@ namespace OpenSim.Tests.Common
     public class TestScene : Scene
     {
         public TestScene(
-            RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene,
+            RegionInfo regInfo, AgentCircuitManager authen, 
             ISimulationDataService simDataService, IEstateDataService estateDataService,
             IConfigSource config, string simulatorVersion)
-            : base(regInfo, authen, physicsScene, simDataService, estateDataService,
+            : base(regInfo, authen, simDataService, estateDataService,
                    config, simulatorVersion)
         {
         }
diff --git a/OpenSim/Tests/Common/OpenSimTestCase.cs b/OpenSim/Tests/Common/OpenSimTestCase.cs
index c1415af..9fea348 100644
--- a/OpenSim/Tests/Common/OpenSimTestCase.cs
+++ b/OpenSim/Tests/Common/OpenSimTestCase.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Tests.Common
         [SetUp]
         public virtual void SetUp()
         {
-//            TestHelpers.InMethod();
+            //TestHelpers.InMethod();
             // Disable logging for each test so that one where logging is enabled doesn't cause all subsequent tests
             // to have logging on if it failed with an exception.
             TestHelpers.DisableLogging();
-- 
cgit v1.1