* Shutting down child agents properly in neighbor regions.

4 files changed, 19 insertions, 3 deletions

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index baf24f0..dd7c168 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -175,6 +175,7 @@ namespace OpenSim.Framework.Communications
         public void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz)
         {
             m_userService.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);
+
         }
 
         /// <summary>
diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
index 13ae21f..e93719e 100644
--- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs
+++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
@@ -45,6 +45,6 @@ namespace OpenSim.Framework.Communications
         bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId);
         bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID);
 
-        void TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID);
+        bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/IRegionCommsListener.cs b/OpenSim/Framework/IRegionCommsListener.cs
index 19608c8..c8fc9c5 100644
--- a/OpenSim/Framework/IRegionCommsListener.cs
+++ b/OpenSim/Framework/IRegionCommsListener.cs
@@ -44,12 +44,14 @@ namespace OpenSim.Framework
 
     public delegate void AcknowledgePrimCross(ulong regionHandle, LLUUID PrimID);
 
-    public delegate void CloseAgentConnection(ulong regionHandle, LLUUID agentID);
+    public delegate bool CloseAgentConnection(ulong regionHandle, LLUUID agentID);
 
     public delegate bool RegionUp(RegionInfo region);
 
     public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData);
 
+    
+
 
     public interface IRegionCommsListener
     {
@@ -64,5 +66,6 @@ namespace OpenSim.Framework
         event CloseAgentConnection OnCloseAgentConnection;
         event RegionUp OnRegionUp;
         event ChildAgentUpdate OnChildAgentUpdate;
+       
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 1db5aae..c12c3df 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -45,6 +45,7 @@ namespace OpenSim.Framework
         public event CloseAgentConnection OnCloseAgentConnection;
         public event RegionUp OnRegionUp;
         public event ChildAgentUpdate OnChildAgentUpdate;
+        
 
 
         public string debugRegionName = String.Empty;
@@ -139,12 +140,15 @@ namespace OpenSim.Framework
             return false;
         }
 
-        public virtual void TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID)
+        public virtual bool TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID)
         {
             if (OnCloseAgentConnection != null)
             {
                 OnCloseAgentConnection(regionHandle, agentID);
+                return true;
+
             }
+            return false;
         }
 
         /// <summary>
@@ -179,5 +183,13 @@ namespace OpenSim.Framework
 
             return false;
         }
+
+        public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
+        {
+            if (OnCloseAgentConnection != null)
+                return OnCloseAgentConnection(regionHandle, agentID);
+
+            return false;
+        }
     }
 }
\ No newline at end of file