* Fixed about 7 issues with restarting sims and resolved interRegion comms issues. This includes the issue that MW described this morning.

There's a lot of little nit picky changes that make a world of difference.

1 files changed, 34 insertions, 26 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 68af360..3309431 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -277,15 +277,41 @@ namespace OpenSim.Region.Environment.Scenes
             // This fails to get the desired effect and needs further work.
             if (RegionInfo.RegionHandle != otherRegion.RegionHandle)
             {
-                if (!(m_regionRestartNotifyList.Contains(otherRegion)))
+                if (Math.Abs(otherRegion.RegionLocX - RegionInfo.RegionLocX) <= 1 || Math.Abs(otherRegion.RegionLocY - RegionInfo.RegionLocY) <= 1)
                 {
-                    m_regionRestartNotifyList.Add(otherRegion);
-                    
-                    m_restartWaitTimer = new Timer(20000);
-                    m_restartWaitTimer.AutoReset = false;
-                    m_restartWaitTimer.Elapsed += new ElapsedEventHandler(restart_Notify_Wait_Elapsed);
-                    m_restartWaitTimer.Start();
+                    try
+                    {
+
+                        ForEachScenePresence(delegate(ScenePresence agent)
+                        {
+                            if (!(agent.IsChildAgent))
+                            {
+                                //agent.ControllingClient.new
+                                //this.CommsManager.InterRegion.InformRegionOfChildAgent(otherRegion.RegionHandle, agent.ControllingClient.RequestClientInfo());
+                                InformClientOfNeighbor(agent, otherRegion);
+                            }
+                        }
+
+                        );
+                    }
+                    catch (System.NullReferenceException)
+                    {
+                        // This means that we're not booted up completely yet.
+                    }
+                }
+                else
+                {
+                    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");
                 }
+                //if (!(m_regionRestartNotifyList.Contains(otherRegion)))
+                //{
+                    //m_regionRestartNotifyList.Add(otherRegion);
+                    
+                    //m_restartWaitTimer = new Timer(20000);
+                    //m_restartWaitTimer.AutoReset = false;
+                   // m_restartWaitTimer.Elapsed += new ElapsedEventHandler(restart_Notify_Wait_Elapsed);
+                    //m_restartWaitTimer.Start();
+                //}
             }
             return true;
         }
@@ -342,25 +368,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_restartWaitTimer.Stop();
             foreach (RegionInfo region in m_regionRestartNotifyList)
             {
-                try
-                {
-
-                    ForEachScenePresence(delegate(ScenePresence agent)
-                    {
-                        if (!(agent.IsChildAgent))
-                        {
-                            //agent.ControllingClient.new
-                            //this.CommsManager.InterRegion.InformRegionOfChildAgent(otherRegion.RegionHandle, agent.ControllingClient.RequestClientInfo());
-                            InformClientOfNeighbor(agent, region);
-                        }
-                    }
-
-                    );
-                }
-                catch (System.NullReferenceException)
-                {
-                    // This means that we're not booted up completely yet.
-                }
+                
             }
             // Reset list to nothing.
             m_regionRestartNotifyList = new List<RegionInfo>();