From f9a61f282500d2ac04919794c5391b98f24dd203 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Thu, 4 Feb 2010 10:51:36 +0000
Subject: [PATCH] Some interface and data structure changes, add the missing
 method in friends

---
 OpenSim/Data/IFriendsData.cs                             | 4 ++--
 .../Region/CoreModules/Avatar/Friends/FriendsModule.cs   | 7 ++++++-
 OpenSim/Region/Framework/Interfaces/IFriendsModule.cs    | 9 +++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Data/IFriendsData.cs b/OpenSim/Data/IFriendsData.cs
index 3ddde19e71..76189760e2 100644
--- a/OpenSim/Data/IFriendsData.cs
+++ b/OpenSim/Data/IFriendsData.cs
@@ -35,8 +35,8 @@ namespace OpenSim.Data
     public class FriendsData
     {
         public UUID PrincipalID;
-        public string FriendID;
-        public string Flags;
+        public string Friend;
+        public Dictionary<string, string> Data;
     }
 
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index a07b6e286f..a9388ef2a9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
-using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using FriendInfo = OpenSim.Region.Framework.Interfaces.FriendInfo;
 
 namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
@@ -88,5 +88,10 @@ 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 239a2ba2e0..cab63741dc 100644
--- a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
@@ -31,6 +31,14 @@ 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>
@@ -47,5 +55,6 @@ 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);
     }
 }