aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTedd Hansen2007-12-31 11:38:08 +0000
committerTedd Hansen2007-12-31 11:38:08 +0000
commitfefb00bc9179e5a1b2dd85c1c397f723a5062c53 (patch)
treef3b71c9e7d0feee4dc4df5394ee700005c7804ac /OpenSim/Region
parentStandard library folders can now be configued in the xml in inventory/OpenSim... (diff)
downloadopensim-SC_OLD-fefb00bc9179e5a1b2dd85c1c397f723a5062c53.zip
opensim-SC_OLD-fefb00bc9179e5a1b2dd85c1c397f723a5062c53.tar.gz
opensim-SC_OLD-fefb00bc9179e5a1b2dd85c1c397f723a5062c53.tar.bz2
opensim-SC_OLD-fefb00bc9179e5a1b2dd85c1c397f723a5062c53.tar.xz
Changed from "Load all .dll's in ScriptEngine" to "Load only DotNetEngine" (temporarily hardcoded) to avoid problems with two scriptengines existing in ScriptEngine folder.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 2a3f947..7c9c639 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -383,7 +383,9 @@ namespace OpenSim
383 MainLog.Instance.Verbose("MODULES", "Loading Region's Modules"); 383 MainLog.Instance.Verbose("MODULES", "Loading Region's Modules");
384 384
385 m_moduleLoader.PickupModules(scene, "."); 385 m_moduleLoader.PickupModules(scene, ".");
386 m_moduleLoader.PickupModules(scene, "ScriptEngines"); 386 //m_moduleLoader.PickupModules(scene, "ScriptEngines");
387 m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"), scene);
388
387 389
388 m_moduleLoader.InitialiseSharedModules(scene); 390 m_moduleLoader.InitialiseSharedModules(scene);
389 scene.SetModuleInterfaces(); 391 scene.SetModuleInterfaces();