From 3e75dede1b744fa9a6b7cad00039620de01fb2e2 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 7 Jan 2008 02:12:06 +0000
Subject: 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.

---
 OpenSim/Region/Application/OpenSimMain.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Application')

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
             UDPServer udpServer;
             Scene scene = SetupScene(regionInfo, out udpServer, m_permissions);
 
-            MainLog.Instance.Verbose("MODULES", "Loading Region's Modules");
+            MainLog.Instance.Verbose("MODULES", "Loading Region's modules");
 
             m_moduleLoader.PickupModules(scene, ".");
             //m_moduleLoader.PickupModules(scene, "ScriptEngines");
             //m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);
             MainLog.Instance.Verbose("MODULES", "Loading scripting engine modules");
-            m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);
-        
-            
+            m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);       
 
             m_moduleLoader.InitialiseSharedModules(scene);
             scene.SetModuleInterfaces();
 
             //Server side object editing permissions checking
             scene.PermissionsMngr.BypassPermissions = !m_permissions;
+            
+            // We need to do this after we've initialized the scripting engines.
+            scene.StartScripts();            
 
-            m_sceneManager.Add(scene);
+            m_sceneManager.Add(scene);                        
 
             m_udpServers.Add(udpServer);
             m_regionData.Add(regionInfo);
-- 
cgit v1.1