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

Fixed a bug causing a crash during clientlog on in Windows (Thanks to Rookiie and nebadon for laying all the ground work) 

Fixed a bug, preventing standalone mode to report neighboring sims correctly
afrisby
Tleiades Hax 2007-10-21 09:32:24 +00:00
parent 2f8d7092bc
commit 9f2fcfb3ec
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Communications/Local/LocalBackEndServices.cs
View File

@ -85,7 +85,7 @@ namespace OpenSim.Region.Communications.Local
//Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location"); //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");
if ((reg.RegionLocX > (x - 2)) && (reg.RegionLocX < (x + 2))) if ((reg.RegionLocX > (x - 2)) && (reg.RegionLocX < (x + 2)))
{ {
if ((reg.RegionLocY > (x - 2)) && (reg.RegionLocY < (x + 2))) if ((reg.RegionLocY > (y - 2)) && (reg.RegionLocY < (y + 2)))
{ {
neighbours.Add(reg); neighbours.Add(reg);
} }
@ -255,3 +255,4 @@ namespace OpenSim.Region.Communications.Local
} }

4
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -1084,10 +1084,12 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="endPoint"></param> /// <param name="endPoint"></param>
private void InformClientOfNeighbourAsync(IClientAPI remoteClient, AgentCircuitData a, ulong regionHandle, IPEndPoint endPoint) private void InformClientOfNeighbourAsync(IClientAPI remoteClient, AgentCircuitData a, ulong regionHandle, IPEndPoint endPoint)
{ {
MainLog.Instance.Notice("INTERGRID", "Starting to inform client about neighbours");
bool regionAccepted = commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, a); bool regionAccepted = commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, a);
if (regionAccepted) if (regionAccepted)
remoteClient.InformClientOfNeighbour(regionHandle, endPoint); remoteClient.InformClientOfNeighbour(regionHandle, endPoint);
MainLog.Instance.Notice("INTERGRID", "Completed inform client about neighbours");
} }
/// <summary> /// <summary>
@ -1109,7 +1111,7 @@ namespace OpenSim.Region.Environment.Scenes
InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
d.BeginInvoke(remoteClient, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint, d.BeginInvoke(remoteClient, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint,
InformClientOfNeighbourCompleted, InformClientOfNeighbourCompleted,
null); d);
} }
} }