diff options
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 16 |
1 files changed, 6 insertions, 10 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, |