This moves the 2 friends-related interregion messages out of OGS1 and into the FriendsModule. No functional changes. Those messages were sent over XMLRPC, and that's how it continues to be for now. Just moving this couple of interregion messages out of OGS1, in preparation for the big shlep ahead.

2 files changed, 0 insertions, 46 deletions

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 936e583..e0e07b2 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -324,16 +324,6 @@ namespace OpenSim.Framework.Communications
             return m_messageService.GetFriendRegionInfos(uuids);
         }
 
-        public List<UUID> InformFriendsInOtherRegion(UUID agentId, ulong destRegionHandle, List<UUID> friends, bool online)
-        {
-            return m_interRegion.InformFriendsInOtherRegion(agentId, destRegionHandle, friends, online);
-        }
-
-        public bool TriggerTerminateFriend(ulong regionHandle, UUID agentID, UUID exFriendID)
-        {
-            return m_interRegion.TriggerTerminateFriend(regionHandle, agentID, exFriendID);
-        }
-
         #endregion
 
         #region Packet Handlers
diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
index 6b589b9..2d4eb53 100644
--- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs
+++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
@@ -48,41 +48,5 @@ namespace OpenSim.Framework.Communications
 
         bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID);
 
-        /// <summary>
-        /// Try to inform friends in the given region about online status of agent.
-        /// </summary>
-        /// <param name="agentId">
-        /// The <see cref="UUID"/> of the agent.
-        /// </param>
-        /// <param name="destRegionHandle">
-        /// The regionHandle of the region.
-        /// </param>
-        /// <param name="friends">
-        /// A List of <see cref="UUID"/>s of friends to inform in the given region.
-        /// </param>
-        /// <param name="online">
-        /// Is the agent online or offline
-        /// </param>
-        /// <returns>
-        /// A list of friends that couldn't be reached on this region.
-        /// </returns>
-        List<UUID> InformFriendsInOtherRegion(UUID agentId, ulong destRegionHandle, List<UUID> friends, bool online);
-
-        /// <summary>
-        /// Send TerminateFriend of exFriendID to agent agentID in region regionHandle.
-        /// </summary>
-        /// <param name="regionHandle">
-        /// The handle of the region agentID is in (hopefully).
-        /// </param>
-        /// <param name="agentID">
-        /// The agent to send the packet to.
-        /// </param>
-        /// <param name="exFriendID">
-        /// The ex-friends ID.
-        /// </param>
-        /// <returns>
-        /// Whether the packet could be sent. False if the agent couldn't be found in the region.
-        /// </returns>
-        bool TriggerTerminateFriend(ulong regionHandle, UUID agentID, UUID exFriendID);
     }
 }