2 files changed, 29 insertions, 4 deletions

diff --git a/OpenSim/Services/Friends/FriendsService.cs b/OpenSim/Services/Friends/FriendsService.cs
index 8e1c6c2..dc1e228 100644
--- a/OpenSim/Services/Friends/FriendsService.cs
+++ b/OpenSim/Services/Friends/FriendsService.cs
@@ -27,8 +27,10 @@
 
 using OpenMetaverse;
 using OpenSim.Framework;
+using System;
 using System.Collections.Generic;
 using OpenSim.Services.Interfaces;
+using OpenSim.Data;
 using Nini.Config;
 using log4net;
 using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;
@@ -43,12 +45,35 @@ namespace OpenSim.Services.Friends
 
         public FriendInfo[] GetFriends(UUID PrincipalID)
         {
-            return new FriendInfo[0];
+            FriendsData[] data = m_Database.GetFriends(PrincipalID);
+
+            List<FriendInfo> info = new List<FriendInfo>();
+
+            foreach (FriendsData d in data)
+            {
+                FriendInfo i = new FriendInfo();
+
+                i.PrincipalID = d.PrincipalID;
+                i.Friend = d.Friend;
+                i.MyFlags = Convert.ToInt32(d.Data["Flags"]);
+                i.TheirFlags = Convert.ToInt32(d.Data["TheirFlags"]);
+
+                info.Add(i);
+            }
+
+            return info.ToArray();
         }
 
         public bool StoreFriend(UUID PrincipalID, string Friend, int flags)
         {
-            return false;
+            FriendsData d = new FriendsData();
+
+            d.PrincipalID = PrincipalID;
+            d.Friend = Friend;
+            d.Data = new Dictionary<string, string>();
+            d.Data["Flags"] = flags.ToString();
+
+            return m_Database.Store(d);
         }
 
         public bool Delete(UUID PrincipalID, string Friend)
diff --git a/OpenSim/Services/Interfaces/IFriendsService.cs b/OpenSim/Services/Interfaces/IFriendsService.cs
index dc5a812..811203c 100644
--- a/OpenSim/Services/Interfaces/IFriendsService.cs
+++ b/OpenSim/Services/Interfaces/IFriendsService.cs
@@ -35,8 +35,8 @@ namespace OpenSim.Services.Interfaces
     {
         public UUID PrincipalID;
         public string Friend;
-        int MyFlags;
-        int TheirFlags;
+        public int MyFlags;
+        public int TheirFlags;
     }
 
     public interface IFriendsService