diff options
* Took a stab at getting keys to work as intended
[Provided by openlifegrid.com]
Diffstat (limited to 'OpenSim/Grid/GridServer/GridManager.cs')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 4 |
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 ); |