From a40e7100a232827cffb813bbbbe9374324ad3448 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Wed, 10 Oct 2007 18:24:13 +0000 Subject: * Gave ModuleLoader some good lovin' * Introduced ModuleLoader.PickupModules that currently picks up IRegionModule:s from /bin * Made LogBase thread-safe (or at least not thread-ignorant) * Ignored some genned files --- OpenSim/Region/Examples/SimpleApp/Program.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/Examples/SimpleApp/Program.cs') diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index e05ce87..b8517f7 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs @@ -62,13 +62,15 @@ namespace SimpleApp UDPServer udpServer; - m_moduleLoader = new ModuleLoader(); + m_moduleLoader = new ModuleLoader( m_log ); m_moduleLoader.LoadDefaultSharedModules(""); Scene scene = SetupScene(regionInfo, out udpServer); m_moduleLoader.InitialiseSharedModules(scene); - m_moduleLoader.CreateDefaultModules(scene, ""); + + // m_moduleLoader.CreateDefaultModules(scene, ""); + scene.SetModuleInterfaces(); scene.StartTimer(); @@ -131,7 +133,7 @@ namespace SimpleApp protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, AgentCircuitManager circuitManager) { - return new MyWorld(regionInfo, circuitManager, m_commsManager, m_assetCache, storageManager, m_httpServer, new ModuleLoader()); + return new MyWorld(regionInfo, circuitManager, m_commsManager, m_assetCache, storageManager, m_httpServer, new ModuleLoader( m_log )); } protected override StorageManager CreateStorageManager(RegionInfo regionInfo) -- cgit v1.1