From 109aa00150aea01ba32620b4d965edd459827ff7 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Tue, 2 Sep 2008 12:07:23 +0000 Subject: fix: PostInitialise() not being called on script engines (nasty one that) cleanup: warnings, readability --- OpenSim/Region/Application/OpenSimBase.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Application/OpenSimBase.cs') diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index ce4fdfe..4003001 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -475,7 +475,7 @@ namespace OpenSim { int port = regionInfo.InternalEndPoint.Port; - // set initial RegionID to originRegionID in RegionInfo. (it needs for loding prims) + // set initial originRegionID to RegionID in RegionInfo. (it needs for loding prims) regionInfo.originRegionID = regionInfo.RegionID; // set initial ServerURI @@ -517,7 +517,7 @@ namespace OpenSim m_log.Info("[MODULES]: Loading scripting engine: " + mod); try { - m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", mod), scene); + modules.AddRange(m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", mod), scene)); } catch (Exception ex) { @@ -540,11 +540,13 @@ namespace OpenSim { m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e); - // Carrying on now causes a lot of confusion down the line - we need to get the user's attention + // Carrying on now causes a lot of confusion down the + // line - we need to get the user's attention System.Environment.Exit(1); } - // We need to do this after we've initialized the scripting engines. + // We need to do this after we've initialized the + // scripting engines. scene.CreateScriptInstances(); scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); -- cgit v1.1