aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs28
1 files changed, 23 insertions, 5 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index d784bc8..0ccffd9 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -316,13 +316,29 @@ namespace OpenSim.Grid.GridServer
316 OldSim = getRegion(TheSim.regionHandle); 316 OldSim = getRegion(TheSim.regionHandle);
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 bool brandNew = ( OldSim == null && TheSim.regionRecvKey == config.SimSendKey &&
320 TheSim.regionRecvKey == config.SimRecvKey) || 320 TheSim.regionRecvKey == config.SimRecvKey );
321 (OldSim != null && OldSim.regionRecvKey == TheSim.regionRecvKey && 321
322 OldSim.regionSendKey == TheSim.regionSendKey)) 322 bool overwritingOldOne = ( OldSim != null && OldSim.regionRecvKey == TheSim.regionRecvKey &&
323 OldSim.regionSendKey == TheSim.regionSendKey );
324
325 if (brandNew)
323 { 326 {
324 m_log.Info("[GRID]: Adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " + 327 m_log.Info("[GRID]: Adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " +
325 TheSim.serverURI); 328 TheSim.serverURI);
329 }
330
331 if (overwritingOldOne)
332 {
333 m_log.Info("[GRID]: Overwriting region " + OldSim.regionLocX + " , " + OldSim.regionLocY + " , " +
334 OldSim.serverURI + " with " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " +
335 TheSim.serverURI);
336 }
337
338 if (brandNew ||
339 overwritingOldOne)
340 {
341
326 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 342 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
327 { 343 {
328 try 344 try
@@ -388,7 +404,9 @@ namespace OpenSim.Grid.GridServer
388 NeighbourBlock["regionHandle"] = aSim.Value.regionHandle.ToString(); 404 NeighbourBlock["regionHandle"] = aSim.Value.regionHandle.ToString();
389 405
390 if (aSim.Value.UUID != TheSim.UUID) 406 if (aSim.Value.UUID != TheSim.UUID)
407 {
391 SimNeighboursData.Add(NeighbourBlock); 408 SimNeighboursData.Add(NeighbourBlock);
409 }
392 } 410 }
393 } 411 }
394 else 412 else