aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorlbsa712008-02-14 13:09:33 +0000
committerlbsa712008-02-14 13:09:33 +0000
commit2d066c4136e15320ea4dd155cee2fef85bbdd534 (patch)
tree3bbbabcd4578559b26f6eb6c69fe5c07d6d42b86 /OpenSim
parent* Added more debugging output to GridManager to pin down the key exchange wei... (diff)
downloadopensim-SC_OLD-2d066c4136e15320ea4dd155cee2fef85bbdd534.zip
opensim-SC_OLD-2d066c4136e15320ea4dd155cee2fef85bbdd534.tar.gz
opensim-SC_OLD-2d066c4136e15320ea4dd155cee2fef85bbdd534.tar.bz2
opensim-SC_OLD-2d066c4136e15320ea4dd155cee2fef85bbdd534.tar.xz
* Took a stab at getting keys to work as intended
[Provided by openlifegrid.com]
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 2be1d6d..1c8972e 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -315,8 +315,8 @@ namespace OpenSim.Grid.GridServer
315 OldSim = getRegion(TheSim.regionHandle); 315 OldSim = getRegion(TheSim.regionHandle);
316 if (OldSim == null || OldSim.UUID == TheSim.UUID) 316 if (OldSim == null || OldSim.UUID == TheSim.UUID)
317 { 317 {
318 bool brandNew = ( OldSim == null && TheSim.regionRecvKey == config.SimSendKey && 318 bool brandNew = ( OldSim == null && TheSim.regionRecvKey == config.SimSendKey &&
319 TheSim.regionRecvKey == config.SimRecvKey ); 319 TheSim.regionSendKey == config.SimRecvKey);
320 320
321 bool overwritingOldOne = ( OldSim != null && OldSim.regionRecvKey == TheSim.regionRecvKey && 321 bool overwritingOldOne = ( OldSim != null && OldSim.regionRecvKey == TheSim.regionRecvKey &&
322 OldSim.regionSendKey == TheSim.regionSendKey ); 322 OldSim.regionSendKey == TheSim.regionSendKey );