aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples
diff options
context:
space:
mode:
authorlbsa712007-10-10 18:24:13 +0000
committerlbsa712007-10-10 18:24:13 +0000
commita40e7100a232827cffb813bbbbe9374324ad3448 (patch)
tree7f16f392d653f155ca90d5477c842db9c881f3ed /OpenSim/Region/Examples
parentAdded unit tests, based on nunit for the IInventoryData (diff)
downloadopensim-SC_OLD-a40e7100a232827cffb813bbbbe9374324ad3448.zip
opensim-SC_OLD-a40e7100a232827cffb813bbbbe9374324ad3448.tar.gz
opensim-SC_OLD-a40e7100a232827cffb813bbbbe9374324ad3448.tar.bz2
opensim-SC_OLD-a40e7100a232827cffb813bbbbe9374324ad3448.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Examples')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs8
1 files changed, 5 insertions, 3 deletions
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
62 62
63 UDPServer udpServer; 63 UDPServer udpServer;
64 64
65 m_moduleLoader = new ModuleLoader(); 65 m_moduleLoader = new ModuleLoader( m_log );
66 m_moduleLoader.LoadDefaultSharedModules(""); 66 m_moduleLoader.LoadDefaultSharedModules("");
67 67
68 Scene scene = SetupScene(regionInfo, out udpServer); 68 Scene scene = SetupScene(regionInfo, out udpServer);
69 69
70 m_moduleLoader.InitialiseSharedModules(scene); 70 m_moduleLoader.InitialiseSharedModules(scene);
71 m_moduleLoader.CreateDefaultModules(scene, ""); 71
72 // m_moduleLoader.CreateDefaultModules(scene, "");
73
72 scene.SetModuleInterfaces(); 74 scene.SetModuleInterfaces();
73 75
74 scene.StartTimer(); 76 scene.StartTimer();
@@ -131,7 +133,7 @@ namespace SimpleApp
131 133
132 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, AgentCircuitManager circuitManager) 134 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, AgentCircuitManager circuitManager)
133 { 135 {
134 return new MyWorld(regionInfo, circuitManager, m_commsManager, m_assetCache, storageManager, m_httpServer, new ModuleLoader()); 136 return new MyWorld(regionInfo, circuitManager, m_commsManager, m_assetCache, storageManager, m_httpServer, new ModuleLoader( m_log ));
135 } 137 }
136 138
137 protected override StorageManager CreateStorageManager(RegionInfo regionInfo) 139 protected override StorageManager CreateStorageManager(RegionInfo regionInfo)