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

2 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index fdc3994..89213a4 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Communications.Local
                     //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");
                     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);
                         }
@@ -255,3 +255,4 @@ namespace OpenSim.Region.Communications.Local
 }
 
 
+
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index ab94842..f7e3543 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1084,10 +1084,12 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="endPoint"></param>
         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);
 
             if (regionAccepted)
                 remoteClient.InformClientOfNeighbour(regionHandle, endPoint);
+            MainLog.Instance.Notice("INTERGRID", "Completed inform client about neighbours");
         }
 
         /// <summary>
@@ -1109,7 +1111,7 @@ namespace OpenSim.Region.Environment.Scenes
                     InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
                     d.BeginInvoke(remoteClient, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint,
                                                                  InformClientOfNeighbourCompleted,
-                                                                 null);
+                                                                 d);
 
                 }
             }