From cf6e268d6dab25464b529bd10aa99036c6bf23ea Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 14 Feb 2008 13:02:41 +0000 Subject: [PATCH] * Added more debugging output to GridManager to pin down the key exchange weirdness [Provided by openlifegrid.com] --- OpenSim/Grid/GridServer/GridManager.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index efab4fce95..2be1d6d48b 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs @@ -308,7 +308,6 @@ namespace OpenSim.Grid.GridServer TheSim.httpServerURI = "http://" + TheSim.serverIP + ":" + TheSim.httpPort + "/"; - TheSim.regionName = (string)requestData["sim_name"]; TheSim.UUID = new LLUUID((string)requestData["UUID"]); @@ -477,8 +476,21 @@ namespace OpenSim.Grid.GridServer } else { - m_log.Warn("[grid]: Authentication failed when trying to add new region " + TheSim.regionName + " at location " + TheSim.regionLocX + " " + TheSim.regionLocY + " currently occupied by " + OldSim.regionName); - responseData["error"] = "The key required to connect to your region did not match. Please check your send and recieve keys."; + if (OldSim == null) + { + m_log.Warn("[grid]: Authentication failed when trying to add new region " + TheSim.regionName + + " at location " + TheSim.regionLocX + + " " + TheSim.regionLocY + " with TheSim.regionRecvKey " + TheSim.regionRecvKey + "(" + config.SimSendKey + ") and TheSim.regionRecvKey " + TheSim.regionSendKey + "(" + config.SimRecvKey + ") "); + } + else + { + m_log.Warn("[grid]: Authentication failed when trying to add new region " + TheSim.regionName + + " at location " + TheSim.regionLocX + + " " + TheSim.regionLocY + " currently occupied by " + OldSim.regionName); + } + + responseData["error"] = + "The key required to connect to your region did not match. Please check your send and recieve keys."; return response; } }