aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-23 22:44:59 +0000
committerTeravus Ovares2008-04-23 22:44:59 +0000
commit1909d74d5fa8e6cea151bb5ff6b8e40b197b9f90 (patch)
treee2f37410f60a2b038c7ced800008491c7d0f1d88 /OpenSim/Region/Application/OpenSimMain.cs
parent* Add NUnit to CONTRIBUTORS file (diff)
downloadopensim-SC_OLD-1909d74d5fa8e6cea151bb5ff6b8e40b197b9f90.zip
opensim-SC_OLD-1909d74d5fa8e6cea151bb5ff6b8e40b197b9f90.tar.gz
opensim-SC_OLD-1909d74d5fa8e6cea151bb5ff6b8e40b197b9f90.tar.bz2
opensim-SC_OLD-1909d74d5fa8e6cea151bb5ff6b8e40b197b9f90.tar.xz
* Patch from Melanie. Mantis 0001037: Add various internal plumbing to the example economy module, implements llSetPayPrice(), money() and llGiveMoney() in scripts. Thanks Melanie!
* Moves module loading before the script engine so the script engine can pick up events from modules registering interfaces with scene.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index e3e0b4a..b0ca496 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -522,6 +522,10 @@ namespace OpenSim
522 m_log.Info("[MODULES]: Loading Region's modules"); 522 m_log.Info("[MODULES]: Loading Region's modules");
523 523
524 List<IRegionModule> modules = m_moduleLoader.PickupModules(scene, "."); 524 List<IRegionModule> modules = m_moduleLoader.PickupModules(scene, ".");
525 // This needs to be ahead of the script engine load, so the
526 // script module can pick up events exposed by a module
527 m_moduleLoader.InitialiseSharedModules(scene);
528
525 //m_moduleLoader.PickupModules(scene, "ScriptEngines"); 529 //m_moduleLoader.PickupModules(scene, "ScriptEngines");
526 //m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene); 530 //m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);
527 531
@@ -547,7 +551,6 @@ namespace OpenSim
547 } 551 }
548 } 552 }
549 553
550 m_moduleLoader.InitialiseSharedModules(scene);
551 scene.SetModuleInterfaces(); 554 scene.SetModuleInterfaces();
552 555
553 //moved these here as the terrain texture has to be created after the modules are initialized 556 //moved these here as the terrain texture has to be created after the modules are initialized