From 2a988f187ec4c743d6b269fc3a8fe32d84716f65 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Wed, 14 May 2008 23:15:25 +0000 Subject: * Refactored IConfigSource into Physics plug-ins and Scene. We can get rid of some of the parameters we pass to it's constructor now like, 'm_allowPhysicalPrim', 'seeIntoOtherRegions', etc.. so on * The main purpose of this is to provide configuration options for ODE and other physics plug-ins that are advanced enough to be able to be configured. --- OpenSim/Region/Application/OpenSimMain.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Application') 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 protected List m_plugins = new List(); + protected IConfigSource m_finalConfig = null; + protected IniConfigSource m_config; public IniConfigSource ConfigSource @@ -309,10 +311,10 @@ namespace OpenSim m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false); } - //if (!m_sandbox) - //m_SendChildAgentTaskData = false; + m_networkServersInfo.loadFromConfiguration(m_config); + } private ManualResetEvent WorldHasComeToAnEnd = new ManualResetEvent(false); @@ -622,7 +624,8 @@ namespace OpenSim return new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, storageManager, m_httpServer, - m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor); + m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor, m_config); + } public void handleRestartRegion(RegionInfo whichRegion) @@ -668,7 +671,7 @@ namespace OpenSim protected override PhysicsScene GetPhysicsScene() { - return GetPhysicsScene(m_physicsEngine, m_meshEngineName); + return GetPhysicsScene(m_physicsEngine, m_meshEngineName, m_config); } /// -- cgit v1.1