aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs20
1 files changed, 8 insertions, 12 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 2fc2d0a..08b499d 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -76,11 +76,6 @@ namespace OpenSim
76 private readonly string m_logFilename = ("region-console.log"); 76 private readonly string m_logFilename = ("region-console.log");
77 private bool m_permissions = false; 77 private bool m_permissions = false;
78 78
79 private bool m_DefaultModules = true;
80 private string m_exceptModules = "";
81 private bool m_DefaultSharedModules = true;
82 private string m_exceptSharedModules = "";
83
84 private bool standaloneAuthenticate = false; 79 private bool standaloneAuthenticate = false;
85 private string standaloneWelcomeMessage = null; 80 private string standaloneWelcomeMessage = null;
86 private string standaloneInventoryPlugin = "OpenSim.Framework.Data.SQLite.dll"; 81 private string standaloneInventoryPlugin = "OpenSim.Framework.Data.SQLite.dll";
@@ -128,10 +123,10 @@ namespace OpenSim
128 123
129 m_assetStorage = configSource.Configs["Startup"].GetString("asset_database", "db4o"); 124 m_assetStorage = configSource.Configs["Startup"].GetString("asset_database", "db4o");
130 125
131 m_DefaultModules = configSource.Configs["Startup"].GetBoolean("default_modules", true); 126 configSource.Configs["Startup"].GetBoolean("default_modules", true);
132 m_DefaultSharedModules = configSource.Configs["Startup"].GetBoolean("default_shared_modules", true); 127 configSource.Configs["Startup"].GetBoolean("default_shared_modules", true);
133 m_exceptModules = configSource.Configs["Startup"].GetString("except_modules", ""); 128 configSource.Configs["Startup"].GetString("except_modules", "");
134 m_exceptSharedModules = configSource.Configs["Startup"].GetString("except_shared_modules", ""); 129 configSource.Configs["Startup"].GetString("except_shared_modules", "");
135 130
136 standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false); 131 standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false);
137 standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim"); 132 standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim");
@@ -204,7 +199,7 @@ namespace OpenSim
204 199
205 m_moduleLoader = new ModuleLoader( m_log ); 200 m_moduleLoader = new ModuleLoader( m_log );
206 MainLog.Instance.Verbose("Loading Shared Modules"); 201 MainLog.Instance.Verbose("Loading Shared Modules");
207 m_moduleLoader.LoadDefaultSharedModules(m_exceptSharedModules); 202 m_moduleLoader.LoadDefaultSharedModules();
208 203
209 // Load all script engines found (scripting engine is now a IRegionModule so loaded in the module loader 204 // Load all script engines found (scripting engine is now a IRegionModule so loaded in the module loader
210 // OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(m_log); 205 // OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(m_log);
@@ -221,8 +216,9 @@ namespace OpenSim
221 m_moduleLoader.InitialiseSharedModules(scene); 216 m_moduleLoader.InitialiseSharedModules(scene);
222 MainLog.Instance.Verbose("Loading Region's Modules"); 217 MainLog.Instance.Verbose("Loading Region's Modules");
223 218
224 //m_moduleLoader.CreateDefaultModules(scene, m_exceptModules); 219 m_moduleLoader.PickupModules(scene, ".");
225 m_moduleLoader.PickupModules( scene ); 220 m_moduleLoader.PickupModules(scene, "ScriptEngines");
221
226 scene.SetModuleInterfaces(); 222 scene.SetModuleInterfaces();
227 223
228 // Check if we have a script engine to load 224 // Check if we have a script engine to load