diff options
author | Justin Clarke Casey | 2008-01-07 02:12:06 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-01-07 02:12:06 +0000 |
commit | 3e75dede1b744fa9a6b7cad00039620de01fb2e2 (patch) | |
tree | aef7d627d0935d93a1cf01bf6ee16f2584c1a2ac /OpenSim/Region/Application/OpenSimMain.cs | |
parent | * Adding More to the MessageServer classes. (diff) | |
download | opensim-SC-3e75dede1b744fa9a6b7cad00039620de01fb2e2.zip opensim-SC-3e75dede1b744fa9a6b7cad00039620de01fb2e2.tar.gz opensim-SC-3e75dede1b744fa9a6b7cad00039620de01fb2e2.tar.bz2 opensim-SC-3e75dede1b744fa9a6b7cad00039620de01fb2e2.tar.xz |
Persistent prim inventory phase 5. Restart scripts contained in persisted prims on region start.
No user functionality exposed yet - no ini switch to enable persistence or restore. A bit more initial work to do.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index f4e774b..c653192 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -426,23 +426,24 @@ namespace OpenSim | |||
426 | UDPServer udpServer; | 426 | UDPServer udpServer; |
427 | Scene scene = SetupScene(regionInfo, out udpServer, m_permissions); | 427 | Scene scene = SetupScene(regionInfo, out udpServer, m_permissions); |
428 | 428 | ||
429 | MainLog.Instance.Verbose("MODULES", "Loading Region's Modules"); | 429 | MainLog.Instance.Verbose("MODULES", "Loading Region's modules"); |
430 | 430 | ||
431 | m_moduleLoader.PickupModules(scene, "."); | 431 | m_moduleLoader.PickupModules(scene, "."); |
432 | //m_moduleLoader.PickupModules(scene, "ScriptEngines"); | 432 | //m_moduleLoader.PickupModules(scene, "ScriptEngines"); |
433 | //m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene); | 433 | //m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene); |
434 | MainLog.Instance.Verbose("MODULES", "Loading scripting engine modules"); | 434 | MainLog.Instance.Verbose("MODULES", "Loading scripting engine modules"); |
435 | m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene); | 435 | m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene); |
436 | |||
437 | |||
438 | 436 | ||
439 | m_moduleLoader.InitialiseSharedModules(scene); | 437 | m_moduleLoader.InitialiseSharedModules(scene); |
440 | scene.SetModuleInterfaces(); | 438 | scene.SetModuleInterfaces(); |
441 | 439 | ||
442 | //Server side object editing permissions checking | 440 | //Server side object editing permissions checking |
443 | scene.PermissionsMngr.BypassPermissions = !m_permissions; | 441 | scene.PermissionsMngr.BypassPermissions = !m_permissions; |
442 | |||
443 | // We need to do this after we've initialized the scripting engines. | ||
444 | scene.StartScripts(); | ||
444 | 445 | ||
445 | m_sceneManager.Add(scene); | 446 | m_sceneManager.Add(scene); |
446 | 447 | ||
447 | m_udpServers.Add(udpServer); | 448 | m_udpServers.Add(udpServer); |
448 | m_regionData.Add(regionInfo); | 449 | m_regionData.Add(regionInfo); |