diff options
author | UbitUmarov | 2015-09-08 18:45:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-08 18:45:53 +0100 |
commit | 339f60e99064b23fdd4ae2608bc3bd7dbdaa8466 (patch) | |
tree | 4c9fadba337ad3379573dd07bc3be6222183336b /OpenSim/Region | |
parent | more on compile.. (diff) | |
download | opensim-SC_OLD-339f60e99064b23fdd4ae2608bc3bd7dbdaa8466.zip opensim-SC_OLD-339f60e99064b23fdd4ae2608bc3bd7dbdaa8466.tar.gz opensim-SC_OLD-339f60e99064b23fdd4ae2608bc3bd7dbdaa8466.tar.bz2 opensim-SC_OLD-339f60e99064b23fdd4ae2608bc3bd7dbdaa8466.tar.xz |
more on compile..
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs | 3 |
2 files changed, 8 insertions, 11 deletions
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 | |||
267 | 267 | ||
268 | base.StartupSpecific(); | 268 | base.StartupSpecific(); |
269 | 269 | ||
270 | if (EnableInitialPluginLoad) | ||
271 | LoadPlugins(); | ||
270 | 272 | ||
271 | // We still want to post initalize any plugins even if loading has been disabled since a test may have | 273 | // We still want to post initalize any plugins even if loading has been disabled since a test may have |
272 | // inserted them manually. | 274 | // inserted them manually. |
273 | LoadPlugins(); | ||
274 | |||
275 | foreach (IApplicationPlugin plugin in m_plugins) | 275 | foreach (IApplicationPlugin plugin in m_plugins) |
276 | plugin.PostInitialise(); | 276 | plugin.PostInitialise(); |
277 | 277 | ||
@@ -293,10 +293,10 @@ namespace OpenSim | |||
293 | "help " + capitalizedTopic, | 293 | "help " + capitalizedTopic, |
294 | "Get help on plugin command '" + topic + "'", | 294 | "Get help on plugin command '" + topic + "'", |
295 | HandleCommanderHelp); | 295 | HandleCommanderHelp); |
296 | // console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic, | 296 | console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic, |
297 | // "help " + capitalizedTopic, | 297 | "help " + capitalizedTopic, |
298 | // "Get help on plugin command '" + topic + "'", | 298 | "Get help on plugin command '" + topic + "'", |
299 | // HandleCommanderHelp); | 299 | HandleCommanderHelp); |
300 | 300 | ||
301 | ICommander commander = null; | 301 | ICommander commander = null; |
302 | 302 | ||
@@ -773,10 +773,6 @@ namespace OpenSim | |||
773 | protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, | 773 | protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, |
774 | IEstateDataService estateDataService, AgentCircuitManager circuitManager) | 774 | IEstateDataService estateDataService, AgentCircuitManager circuitManager) |
775 | { | 775 | { |
776 | Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ); | ||
777 | PhysicsScene physicsScene = GetPhysicsScene(regionInfo.RegionName, regionExtent); | ||
778 | SceneCommunicationService sceneGridService = new SceneCommunicationService(); | ||
779 | |||
780 | return new Scene( | 776 | return new Scene( |
781 | regionInfo, circuitManager, | 777 | regionInfo, circuitManager, |
782 | simDataService, estateDataService, | 778 | 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 | |||
170 | public class ODEScene : PhysicsScene, INonSharedRegionModule | 170 | public class ODEScene : PhysicsScene, INonSharedRegionModule |
171 | { | 171 | { |
172 | private readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString()); | 172 | private readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString()); |
173 | public string LogHeader = "[UbitODE]"; | ||
173 | private bool m_Enabled = false; | 174 | private bool m_Enabled = false; |
174 | 175 | ||
175 | // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>(); | 176 | // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>(); |
@@ -574,7 +575,7 @@ namespace OpenSim.Region.PhysicsModules.UbitOde | |||
574 | d.WorldSetContactSurfaceLayer(world, contactsurfacelayer); | 575 | d.WorldSetContactSurfaceLayer(world, contactsurfacelayer); |
575 | d.WorldSetContactMaxCorrectingVel(world, 60.0f); | 576 | d.WorldSetContactMaxCorrectingVel(world, 60.0f); |
576 | 577 | ||
577 | m_meshWorker = new ODEMeshWorker(this, m_log, meshmerizer, physicsconfig); | 578 | m_meshWorker = new ODEMeshWorker(this, m_log, mesher, physicsconfig); |
578 | 579 | ||
579 | HalfOdeStep = ODE_STEPSIZE * 0.5f; | 580 | HalfOdeStep = ODE_STEPSIZE * 0.5f; |
580 | odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f); | 581 | odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f); |