diff options
author | Sean Dague | 2007-10-19 20:27:34 +0000 |
---|---|---|
committer | Sean Dague | 2007-10-19 20:27:34 +0000 |
commit | 139994757c7dab04dd03801266525e8c53395a5e (patch) | |
tree | 003ec2557de6dd80dbe1e7bc78efe8958d02d5ae /OpenSim/Region/Examples | |
parent | * Test thy commits! (oops, sorry!) (diff) | |
download | opensim-SC_OLD-139994757c7dab04dd03801266525e8c53395a5e.zip opensim-SC_OLD-139994757c7dab04dd03801266525e8c53395a5e.tar.gz opensim-SC_OLD-139994757c7dab04dd03801266525e8c53395a5e.tar.bz2 opensim-SC_OLD-139994757c7dab04dd03801266525e8c53395a5e.tar.xz |
changes to pass nini config object to the modules that get
loaded so that they may read out any bits they are interested in
Diffstat (limited to 'OpenSim/Region/Examples')
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/Program.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index 7967867..35f2051 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs | |||
@@ -39,12 +39,15 @@ using OpenSim.Region.Communications.Local; | |||
39 | using OpenSim.Region.Environment; | 39 | using OpenSim.Region.Environment; |
40 | using OpenSim.Region.Environment.Scenes; | 40 | using OpenSim.Region.Environment.Scenes; |
41 | using OpenSim.Region.Physics.Manager; | 41 | using OpenSim.Region.Physics.Manager; |
42 | using Nini.Config; | ||
42 | 43 | ||
43 | namespace SimpleApp | 44 | namespace SimpleApp |
44 | { | 45 | { |
45 | class Program : RegionApplicationBase, conscmd_callback | 46 | class Program : RegionApplicationBase, conscmd_callback |
46 | { | 47 | { |
47 | private ModuleLoader m_moduleLoader; | 48 | private ModuleLoader m_moduleLoader; |
49 | private IConfigSource m_config; | ||
50 | |||
48 | protected override LogBase CreateLog() | 51 | protected override LogBase CreateLog() |
49 | { | 52 | { |
50 | return new LogBase(null, "SimpleApp", this, false); | 53 | return new LogBase(null, "SimpleApp", this, false); |
@@ -86,7 +89,7 @@ namespace SimpleApp | |||
86 | 89 | ||
87 | UDPServer udpServer; | 90 | UDPServer udpServer; |
88 | 91 | ||
89 | m_moduleLoader = new ModuleLoader( m_log ); | 92 | m_moduleLoader = new ModuleLoader( m_log, m_config ); |
90 | m_moduleLoader.LoadDefaultSharedModules(); | 93 | m_moduleLoader.LoadDefaultSharedModules(); |
91 | 94 | ||
92 | Scene scene = SetupScene(regionInfo, out udpServer); | 95 | Scene scene = SetupScene(regionInfo, out udpServer); |
@@ -155,7 +158,7 @@ namespace SimpleApp | |||
155 | 158 | ||
156 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, AgentCircuitManager circuitManager) | 159 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, AgentCircuitManager circuitManager) |
157 | { | 160 | { |
158 | return new MyWorld(regionInfo, circuitManager, m_commsManager, m_assetCache, storageManager, m_httpServer, new ModuleLoader( m_log )); | 161 | return new MyWorld(regionInfo, circuitManager, m_commsManager, m_assetCache, storageManager, m_httpServer, new ModuleLoader( m_log, m_config )); |
159 | } | 162 | } |
160 | 163 | ||
161 | protected override StorageManager CreateStorageManager(RegionInfo regionInfo) | 164 | protected override StorageManager CreateStorageManager(RegionInfo regionInfo) |