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

* Added some more comprehensive log entries on region login. 

[Provided by openlifegrid.com]
ThreadPoolClientBranch
lbsa71 2008-02-13 21:05:26 +00:00
parent b05409b03f
commit 952cdd4166
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,13 +316,29 @@ namespace OpenSim.Grid.GridServer
OldSim = getRegion(TheSim.regionHandle); OldSim = getRegion(TheSim.regionHandle);
if (OldSim == null || OldSim.UUID == TheSim.UUID) if (OldSim == null || OldSim.UUID == TheSim.UUID)
{ {
if ((OldSim == null && TheSim.regionRecvKey == config.SimSendKey && bool brandNew = ( OldSim == null && TheSim.regionRecvKey == config.SimSendKey &&
TheSim.regionRecvKey == config.SimRecvKey) || TheSim.regionRecvKey == config.SimRecvKey );
(OldSim != null && OldSim.regionRecvKey == TheSim.regionRecvKey &&
OldSim.regionSendKey == TheSim.regionSendKey)) bool overwritingOldOne = ( OldSim != null && OldSim.regionRecvKey == TheSim.regionRecvKey &&
OldSim.regionSendKey == TheSim.regionSendKey );
if (brandNew)
{ {
m_log.Info("[GRID]: Adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " + m_log.Info("[GRID]: Adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " +
TheSim.serverURI); TheSim.serverURI);
}
if (overwritingOldOne)
{
m_log.Info("[GRID]: Overwriting region " + OldSim.regionLocX + " , " + OldSim.regionLocY + " , " +
OldSim.serverURI + " with " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " +
TheSim.serverURI);
}
if (brandNew ||
overwritingOldOne)
{
foreach (KeyValuePair<string, IGridData> kvp in _plugins) foreach (KeyValuePair<string, IGridData> kvp in _plugins)
{ {
try try
@ -388,9 +404,11 @@ namespace OpenSim.Grid.GridServer
NeighbourBlock["regionHandle"] = aSim.Value.regionHandle.ToString(); NeighbourBlock["regionHandle"] = aSim.Value.regionHandle.ToString();
if (aSim.Value.UUID != TheSim.UUID) if (aSim.Value.UUID != TheSim.UUID)
{
SimNeighboursData.Add(NeighbourBlock); SimNeighboursData.Add(NeighbourBlock);
} }
} }
}
else else
{ {
for (int x = -1; x < 2; x++) for (int x = -1; x < 2; x++)