aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs10
1 files changed, 6 insertions, 4 deletions
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
475 { 475 {
476 int port = regionInfo.InternalEndPoint.Port; 476 int port = regionInfo.InternalEndPoint.Port;
477 477
478 // set initial RegionID to originRegionID in RegionInfo. (it needs for loding prims) 478 // set initial originRegionID to RegionID in RegionInfo. (it needs for loding prims)
479 regionInfo.originRegionID = regionInfo.RegionID; 479 regionInfo.originRegionID = regionInfo.RegionID;
480 480
481 // set initial ServerURI 481 // set initial ServerURI
@@ -517,7 +517,7 @@ namespace OpenSim
517 m_log.Info("[MODULES]: Loading scripting engine: " + mod); 517 m_log.Info("[MODULES]: Loading scripting engine: " + mod);
518 try 518 try
519 { 519 {
520 m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", mod), scene); 520 modules.AddRange(m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", mod), scene));
521 } 521 }
522 catch (Exception ex) 522 catch (Exception ex)
523 { 523 {
@@ -540,11 +540,13 @@ namespace OpenSim
540 { 540 {
541 m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e); 541 m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e);
542 542
543 // Carrying on now causes a lot of confusion down the line - we need to get the user's attention 543 // Carrying on now causes a lot of confusion down the
544 // line - we need to get the user's attention
544 System.Environment.Exit(1); 545 System.Environment.Exit(1);
545 } 546 }
546 547
547 // We need to do this after we've initialized the scripting engines. 548 // We need to do this after we've initialized the
549 // scripting engines.
548 scene.CreateScriptInstances(); 550 scene.CreateScriptInstances();
549 551
550 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); 552 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);