aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs13
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index d910dc4..c7094c7 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -569,7 +569,18 @@ namespace OpenSim
569 //moved these here as the terrain texture has to be created after the modules are initialized 569 //moved these here as the terrain texture has to be created after the modules are initialized
570 // and has to happen before the region is registered with the grid. 570 // and has to happen before the region is registered with the grid.
571 scene.CreateTerrainTexture(true); 571 scene.CreateTerrainTexture(true);
572 scene.RegisterRegionWithGrid(); 572
573 try
574 {
575 scene.RegisterRegionWithGrid();
576 }
577 catch (Exception e)
578 {
579 m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e);
580
581 // Carrying on now causes a lot of confusion down the line - we need to get the user's attention
582 System.Environment.Exit(1);
583 }
573 584
574 // We need to do this after we've initialized the scripting engines. 585 // We need to do this after we've initialized the scripting engines.
575 scene.StartScripts(); 586 scene.StartScripts();