2 files changed, 28 insertions, 11 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 01bcd83..587d940 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -269,7 +269,12 @@ namespace OpenSim.Region.Environment.Scenes
         {
            // Another region is up.   
            // We have to tell all our ScenePresences about it.. 
-           //and add it to the neighbor list.
+           // and add it to the neighbor list.
+
+            // We only add it to the neighbor list if it's within 1 region from here.
+            // Agents may have draw distance values that cross two regions though, so 
+            // we add it to the notify list regardless of distance.  
+            // We'll check the agent's draw distance before notifying them though.
            
 
             if (RegionInfo.RegionHandle != otherRegion.RegionHandle)
@@ -297,12 +302,11 @@ namespace OpenSim.Region.Environment.Scenes
                     {
                         m_neighbours.Add(otherRegion);
                     }
-
                     if (!(m_regionRestartNotifyList.Contains(otherRegion)))
                     {
                         m_regionRestartNotifyList.Add(otherRegion);
-                    
-                        m_restartWaitTimer.Interval= 50000;
+
+                        m_restartWaitTimer.Interval = 50000;
                         m_restartWaitTimer.AutoReset = false;
                         m_restartWaitTimer.Elapsed += new ElapsedEventHandler(RestartNotifyWaitElapsed);
                         m_restartWaitTimer.Start();
@@ -312,6 +316,9 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     MainLog.Instance.Verbose("INTERGRID", "Got notice about Region at X:" + otherRegion.RegionLocX.ToString() + " Y:" + otherRegion.RegionLocY.ToString() + " but it was too far away to send to the client");
                 }
+
+                
+               
                 
             }
             return true;
@@ -1250,7 +1257,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="presence"></param>
         public void InformClientOfNeighbours(ScenePresence presence)
         {
-            m_sceneGridService.EnableNeighbourChildAgents(presence);
+            m_sceneGridService.EnableNeighbourChildAgents(presence, m_neighbours);
         }
 
         /// <summary>
@@ -1260,7 +1267,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="region"></param>
         public void InformClientOfNeighbor(ScenePresence presence, RegionInfo region)
         {
-            m_sceneGridService.InformNeighborChildAgent(presence, region);
+            m_sceneGridService.InformNeighborChildAgent(presence, region, m_neighbours);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 4d2379b..68bb3b5 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -191,14 +191,24 @@ namespace OpenSim.Region.Environment.Scenes
         /// <summary>
         /// 
         /// </summary>
-        public void EnableNeighbourChildAgents(ScenePresence avatar)
+        public void EnableNeighbourChildAgents(ScenePresence avatar, List<RegionInfo> lstneighbours)
         {
-            List<SimpleRegionInfo> neighbours =
-                m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
+            List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
+
+                //m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
+            for (int i = 0; i < lstneighbours.Count; i++)
+            {
+                // We don't want to keep sending to regions that consistently fail on comms.
+                if (!(lstneighbours[i].commFailTF))
+                {
+                    neighbours.Add(new SimpleRegionInfo(lstneighbours[i]));
+                }
+            }
             if (neighbours != null)
             {
                 for (int i = 0; i < neighbours.Count; i++)
                 {
+                    
                     AgentCircuitData agent = avatar.ControllingClient.RequestClientInfo();
                     agent.BaseFolder = LLUUID.Zero;
                     agent.InventoryFolder = LLUUID.Zero;
@@ -212,7 +222,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
         }
-        public void InformNeighborChildAgent(ScenePresence avatar, RegionInfo region)
+        public void InformNeighborChildAgent(ScenePresence avatar, RegionInfo region, List<RegionInfo> neighbours)
         {
             AgentCircuitData agent = avatar.ControllingClient.RequestClientInfo();
             agent.BaseFolder = LLUUID.Zero;
@@ -257,7 +267,7 @@ namespace OpenSim.Region.Environment.Scenes
 
 
             List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
-            
+            // This stays uncached because we don't already know about our neighbors at this point.
             neighbours = m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
             if (neighbours != null)
             {