From 339f60e99064b23fdd4ae2608bc3bd7dbdaa8466 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 8 Sep 2015 18:45:53 +0100
Subject: more on compile..

---
 OpenSim/Region/Application/OpenSimBase.cs         | 16 ++++++----------
 OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs |  3 ++-
 OpenSim/Tests/Common/Helpers/SceneHelpers.cs      |  9 ---------
 3 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index a7ebff3..41966ff 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -267,11 +267,11 @@ namespace OpenSim
 
             base.StartupSpecific();
 
+            if (EnableInitialPluginLoad)
+                LoadPlugins();
 
             // We still want to post initalize any plugins even if loading has been disabled since a test may have
             // inserted them manually.
-            LoadPlugins();
-
             foreach (IApplicationPlugin plugin in m_plugins)
                 plugin.PostInitialise();
 
@@ -293,10 +293,10 @@ namespace OpenSim
                                               "help " + capitalizedTopic,
                                               "Get help on plugin command '" + topic + "'",
                                               HandleCommanderHelp);
-//                console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic,
-//                                              "help " + capitalizedTopic,
-//                                              "Get help on plugin command '" + topic + "'",
-//                                              HandleCommanderHelp);
+                console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic,
+                                              "help " + capitalizedTopic,
+                                              "Get help on plugin command '" + topic + "'",
+                                              HandleCommanderHelp);
 
                 ICommander commander = null;
 
@@ -773,10 +773,6 @@ namespace OpenSim
         protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService,
             IEstateDataService estateDataService, AgentCircuitManager circuitManager)
         {
-            Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ);
-            PhysicsScene physicsScene = GetPhysicsScene(regionInfo.RegionName, regionExtent);
-            SceneCommunicationService sceneGridService = new SceneCommunicationService();
-
             return new Scene(
                 regionInfo, circuitManager,  
                 simDataService, estateDataService,
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs b/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs
index fe8f5d8..4031f0d 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs
+++ b/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs
@@ -170,6 +170,7 @@ namespace OpenSim.Region.PhysicsModules.UbitOde
     public class ODEScene : PhysicsScene, INonSharedRegionModule
     {
         private readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString());
+        public string LogHeader = "[UbitODE]";
         private bool m_Enabled = false;
 
         // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
@@ -574,7 +575,7 @@ namespace OpenSim.Region.PhysicsModules.UbitOde
             d.WorldSetContactSurfaceLayer(world, contactsurfacelayer);
             d.WorldSetContactMaxCorrectingVel(world, 60.0f);
 
-            m_meshWorker = new ODEMeshWorker(this, m_log, meshmerizer, physicsconfig);
+            m_meshWorker = new ODEMeshWorker(this, m_log, mesher, physicsconfig);
 
             HalfOdeStep = ODE_STEPSIZE * 0.5f;
             odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f);
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 5cd5b88..9ab8d13 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -153,15 +153,6 @@ namespace OpenSim.Tests.Common
             regInfo.RegionSizeX = sizeX;
             regInfo.RegionSizeY = sizeY;
 
-            SceneCommunicationService scs = new SceneCommunicationService();
-
-            PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
-            physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.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, SimDataService, m_estateDataService, configSource, null);
 
-- 
cgit v1.1