diff options
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index e7386ff..a8f4bd4 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -96,6 +96,8 @@ namespace OpenSim | |||
96 | 96 | ||
97 | protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>(); | 97 | protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>(); |
98 | 98 | ||
99 | protected IConfigSource m_finalConfig = null; | ||
100 | |||
99 | protected IniConfigSource m_config; | 101 | protected IniConfigSource m_config; |
100 | 102 | ||
101 | public IniConfigSource ConfigSource | 103 | public IniConfigSource ConfigSource |
@@ -309,10 +311,10 @@ namespace OpenSim | |||
309 | 311 | ||
310 | m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false); | 312 | m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false); |
311 | } | 313 | } |
312 | //if (!m_sandbox) | 314 | |
313 | //m_SendChildAgentTaskData = false; | ||
314 | 315 | ||
315 | m_networkServersInfo.loadFromConfiguration(m_config); | 316 | m_networkServersInfo.loadFromConfiguration(m_config); |
317 | |||
316 | } | 318 | } |
317 | 319 | ||
318 | private ManualResetEvent WorldHasComeToAnEnd = new ManualResetEvent(false); | 320 | private ManualResetEvent WorldHasComeToAnEnd = new ManualResetEvent(false); |
@@ -622,7 +624,8 @@ namespace OpenSim | |||
622 | return | 624 | return |
623 | new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, | 625 | new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, |
624 | storageManager, m_httpServer, | 626 | storageManager, m_httpServer, |
625 | m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor); | 627 | m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor, m_config); |
628 | |||
626 | } | 629 | } |
627 | 630 | ||
628 | public void handleRestartRegion(RegionInfo whichRegion) | 631 | public void handleRestartRegion(RegionInfo whichRegion) |
@@ -668,7 +671,7 @@ namespace OpenSim | |||
668 | 671 | ||
669 | protected override PhysicsScene GetPhysicsScene() | 672 | protected override PhysicsScene GetPhysicsScene() |
670 | { | 673 | { |
671 | return GetPhysicsScene(m_physicsEngine, m_meshEngineName); | 674 | return GetPhysicsScene(m_physicsEngine, m_meshEngineName, m_config); |
672 | } | 675 | } |
673 | 676 | ||
674 | /// <summary> | 677 | /// <summary> |