aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorlbsa712008-02-13 20:51:59 +0000
committerlbsa712008-02-13 20:51:59 +0000
commitb05409b03fcea12d8cd555a49fcb7f4215f74474 (patch)
tree6d1b16dc650dbdf80b5a441c8e7087dfca7464a0 /OpenSim
parent* Moved insertUserRow into MSSQLUserData so 'create user' works again (diff)
downloadopensim-SC_OLD-b05409b03fcea12d8cd555a49fcb7f4215f74474.zip
opensim-SC_OLD-b05409b03fcea12d8cd555a49fcb7f4215f74474.tar.gz
opensim-SC_OLD-b05409b03fcea12d8cd555a49fcb7f4215f74474.tar.bz2
opensim-SC_OLD-b05409b03fcea12d8cd555a49fcb7f4215f74474.tar.xz
* Minor guard for null case.
[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 49b9aa2..d784bc8 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -317,8 +317,8 @@ namespace OpenSim.Grid.GridServer
317 if (OldSim == null || OldSim.UUID == TheSim.UUID) 317 if (OldSim == null || OldSim.UUID == TheSim.UUID)
318 { 318 {
319 if ((OldSim == null && TheSim.regionRecvKey == config.SimSendKey && 319 if ((OldSim == null && TheSim.regionRecvKey == config.SimSendKey &&
320 TheSim.regionRecvKey == config.SimRecvKey) || 320 TheSim.regionRecvKey == config.SimRecvKey) ||
321 (OldSim.regionRecvKey == TheSim.regionRecvKey && 321 (OldSim != null && OldSim.regionRecvKey == TheSim.regionRecvKey &&
322 OldSim.regionSendKey == TheSim.regionSendKey)) 322 OldSim.regionSendKey == TheSim.regionSendKey))
323 { 323 {
324 m_log.Info("[GRID]: Adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " + 324 m_log.Info("[GRID]: Adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " +