Finally cutting the gordian knot. Friends needs to be both a module and a

service, and never the twain shall meet. This finally opens up the path to
a working friends implementation

2 files changed, 0 insertions, 15 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index a9388ef..f383bad 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -40,7 +40,6 @@ using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
-using FriendInfo = OpenSim.Region.Framework.Interfaces.FriendInfo;
 
 namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
@@ -88,10 +87,5 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         {
             return 1;
         }
-
-        public FriendInfo[] GetFriends(UUID PrincipalID)
-        {
-            return new FriendInfo[0];
-        }
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
index cab6374..239a2ba 100644
--- a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
@@ -31,14 +31,6 @@ using System.Collections.Generic;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
-    public struct FriendInfo
-    {
-        public UUID PrincipalID;
-        public string Friend;
-        int MyRights;
-        int TheirRights;
-    }
-
     public interface IFriendsModule
     {
         /// <summary>
@@ -55,6 +47,5 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="offerMessage"></param>
         void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage);
         uint GetFriendPerms(UUID PrincipalID, UUID FriendID);
-        FriendInfo[] GetFriends(UUID PrincipalID);
     }
 }