From 6717839d65cba890bfdaed5764c9cd48484483e5 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 15 Aug 2008 10:26:03 +0000
Subject: Fixes a case where neighboring region info cannot be obtained and the
 region server tries to output the region information using the unobtainable
 RegionInfo. Caused a crash in GS1GridServices.cs, line 928

---
 OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Communications/OGS1/OGS1GridServices.cs')

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 4f62d35..fe07275 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -925,9 +925,12 @@ namespace OpenSim.Region.Communications.OGS1
             {
                 NoteDeadRegion(regionHandle);
 
-                m_log.WarnFormat(
-                    "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
-                    regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
+				if(regInfo != null)
+				{
+					m_log.WarnFormat(
+						"[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
+						regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
+				}
                 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
 
                 return false;
-- 
cgit v1.1