From d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 12 May 2008 16:57:56 +0000
Subject: * If a region running in grid mode fails to login to the grid
 service, startup will now terminate instead of carrying on (and thus burying
 the error message)

---
 OpenSim/Region/Application/OpenSimMain.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Application')

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
             //moved these here as the terrain texture has to be created after the modules are initialized
             // and has to happen before the region is registered with the grid. 
             scene.CreateTerrainTexture(true);
-            scene.RegisterRegionWithGrid();
+            
+            try
+            {
+                scene.RegisterRegionWithGrid();
+            }
+            catch (Exception e)
+            {
+                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
+                System.Environment.Exit(1);
+            }
             
             // We need to do this after we've initialized the scripting engines.
             scene.StartScripts();
-- 
cgit v1.1