diff options
author | lbsa71 | 2008-02-14 13:02:41 +0000 |
---|---|---|
committer | lbsa71 | 2008-02-14 13:02:41 +0000 |
commit | cf6e268d6dab25464b529bd10aa99036c6bf23ea (patch) | |
tree | fa1748a8074756132bf1db522c3128b631b00ec8 | |
parent | * Tree Populator Module, use "script tree" to make a growing tree in your sim. (diff) | |
download | opensim-SC-cf6e268d6dab25464b529bd10aa99036c6bf23ea.zip opensim-SC-cf6e268d6dab25464b529bd10aa99036c6bf23ea.tar.gz opensim-SC-cf6e268d6dab25464b529bd10aa99036c6bf23ea.tar.bz2 opensim-SC-cf6e268d6dab25464b529bd10aa99036c6bf23ea.tar.xz |
* Added more debugging output to GridManager to pin down the key exchange weirdness
[Provided by openlifegrid.com]
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index efab4fc..2be1d6d 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -308,7 +308,6 @@ namespace OpenSim.Grid.GridServer | |||
308 | 308 | ||
309 | TheSim.httpServerURI = "http://" + TheSim.serverIP + ":" + TheSim.httpPort + "/"; | 309 | TheSim.httpServerURI = "http://" + TheSim.serverIP + ":" + TheSim.httpPort + "/"; |
310 | 310 | ||
311 | |||
312 | TheSim.regionName = (string)requestData["sim_name"]; | 311 | TheSim.regionName = (string)requestData["sim_name"]; |
313 | TheSim.UUID = new LLUUID((string)requestData["UUID"]); | 312 | TheSim.UUID = new LLUUID((string)requestData["UUID"]); |
314 | 313 | ||
@@ -477,8 +476,21 @@ namespace OpenSim.Grid.GridServer | |||
477 | } | 476 | } |
478 | else | 477 | else |
479 | { | 478 | { |
480 | 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); | 479 | if (OldSim == null) |
481 | responseData["error"] = "The key required to connect to your region did not match. Please check your send and recieve keys."; | 480 | { |
481 | m_log.Warn("[grid]: Authentication failed when trying to add new region " + TheSim.regionName + | ||
482 | " at location " + TheSim.regionLocX + | ||
483 | " " + TheSim.regionLocY + " with TheSim.regionRecvKey " + TheSim.regionRecvKey + "(" + config.SimSendKey + ") and TheSim.regionRecvKey " + TheSim.regionSendKey + "(" + config.SimRecvKey + ") "); | ||
484 | } | ||
485 | else | ||
486 | { | ||
487 | m_log.Warn("[grid]: Authentication failed when trying to add new region " + TheSim.regionName + | ||
488 | " at location " + TheSim.regionLocX + | ||
489 | " " + TheSim.regionLocY + " currently occupied by " + OldSim.regionName); | ||
490 | } | ||
491 | |||
492 | responseData["error"] = | ||
493 | "The key required to connect to your region did not match. Please check your send and recieve keys."; | ||
482 | return response; | 494 | return response; |
483 | } | 495 | } |
484 | } | 496 | } |