* Shutting down child agents properly in neighbor regions.

2 files changed, 90 insertions, 2 deletions

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 2ca9022..683fbfb 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -491,7 +491,8 @@ namespace OpenSim.Region.Communications.OGS1
             InterRegionSingleton.Instance.OnPrimGroupNear += TriggerExpectPrimCrossing;
             InterRegionSingleton.Instance.OnRegionUp += TriggerRegionUp;
             InterRegionSingleton.Instance.OnChildAgentUpdate += TriggerChildAgentUpdate;
-            //InterRegionSingleton.Instance.OnRegionUp += RegionUp;
+            InterRegionSingleton.Instance.OnTellRegionToCloseChildConnection += TriggerTellRegionToCloseChildConnection;
+            
         }
 
         #region Methods called by regions in this instance
@@ -959,8 +960,53 @@ namespace OpenSim.Region.Communications.OGS1
             }
         }
 
-        public void TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
+        public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
         {
+            RegionInfo regInfo = null;
+            try
+            {
+                if (m_localBackend.TriggerTellRegionToCloseChildConnection(regionHandle, agentID))
+                {
+                    return true;
+                }
+
+                regInfo = RequestNeighbourInfo(regionHandle);
+                if (regInfo != null)
+                {
+                    bool retValue = false;
+                    OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject(
+                                                                                      typeof(OGS1InterRegionRemoting),
+                                                                                      "tcp://" + regInfo.RemotingAddress +
+                                                                                      ":" + regInfo.RemotingPort +
+                                                                                      "/InterRegions");
+                    if (remObject != null)
+                    {
+                        retValue =
+                            remObject.TellRegionToCloseChildConnection(regionHandle, agentID.UUID);
+                    }
+                    else
+                    {
+                        Console.WriteLine("remoting object not found");
+                    }
+                    remObject = null;
+
+                    return true;
+                }
+                //TODO need to see if we know about where this region is and use .net remoting 
+                // to inform it. 
+                return false;
+            }
+            catch (RemotingException e)
+            {
+                MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region to tell it to close child agents: " + regInfo.RegionName +
+                                      " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
+                //MainLog.Instance.Debug(e.ToString());
+                return false;
+            }
+            catch
+            {
+                return false;
+            }
         }
 
         public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId)
@@ -1086,6 +1132,20 @@ namespace OpenSim.Region.Communications.OGS1
             }
         }
 
+        public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
+        {
+            try
+            {
+                return m_localBackend.TriggerTellRegionToCloseChildConnection(regionHandle, agentID);
+            }
+            catch (RemotingException)
+            {
+                MainLog.Instance.Verbose("INTERREGION", "Remoting Error: Unable to connect to neighbour to tell it to close a child connection");
+                return false;
+            }
+
+        }
+
         #endregion
 
         #endregion
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index a0da07e..b39e0b7 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -45,6 +45,8 @@ namespace OpenSim.Region.Communications.OGS1
 
     public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate childUpdate);
 
+    public delegate bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID);
+
     public sealed class InterRegionSingleton
     {
         private static readonly InterRegionSingleton instance = new InterRegionSingleton();
@@ -55,6 +57,8 @@ namespace OpenSim.Region.Communications.OGS1
         public event PrimGroupArrival OnPrimGroupArrival;
         public event RegionUp OnRegionUp;
         public event ChildAgentUpdate OnChildAgentUpdate;
+        public event TellRegionToCloseChildConnection OnTellRegionToCloseChildConnection;
+
 
 
         static InterRegionSingleton()
@@ -123,6 +127,16 @@ namespace OpenSim.Region.Communications.OGS1
             }
             return false;
         }
+
+        public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
+        {
+            if (OnTellRegionToCloseChildConnection != null)
+            {
+
+                return OnTellRegionToCloseChildConnection(regionHandle, agentID);
+            }
+            return false;
+        }
     }
 
     public class OGS1InterRegionRemoting : MarshalByRefObject
@@ -171,6 +185,7 @@ namespace OpenSim.Region.Communications.OGS1
             }
         }
 
+
         public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, sLLVector3 position, bool isFlying)
         {
             try
@@ -215,5 +230,18 @@ namespace OpenSim.Region.Communications.OGS1
                 return false;
             }
         }
+        public bool TellRegionToCloseChildConnection(ulong regionHandle, Guid agentID)
+        {
+            try
+            {
+                return InterRegionSingleton.Instance.TellRegionToCloseChildConnection(regionHandle, new LLUUID(agentID));
+
+            }
+            catch (RemotingException)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Verbose("INTERREGION", "Remoting Error: Unable to connect to remote region: " + regionHandle.ToString());
+                return false;
+            }
+        }
     }
 }
\ No newline at end of file