OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Minor guard for null case. 

[Provided by openlifegrid.com]
ThreadPoolClientBranch
lbsa71 2008-02-13 20:51:59 +00:00
parent b705ba21f3
commit b05409b03f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -317,8 +317,8 @@ namespace OpenSim.Grid.GridServer
if (OldSim == null || OldSim.UUID == TheSim.UUID) if (OldSim == null || OldSim.UUID == TheSim.UUID)
{ {
if ((OldSim == null && TheSim.regionRecvKey == config.SimSendKey && if ((OldSim == null && TheSim.regionRecvKey == config.SimSendKey &&
TheSim.regionRecvKey == config.SimRecvKey) || TheSim.regionRecvKey == config.SimRecvKey) ||
(OldSim.regionRecvKey == TheSim.regionRecvKey && (OldSim != null && OldSim.regionRecvKey == TheSim.regionRecvKey &&
OldSim.regionSendKey == TheSim.regionSendKey)) OldSim.regionSendKey == TheSim.regionSendKey))
{ {
m_log.Info("[GRID]: Adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " + m_log.Info("[GRID]: Adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " +