2 files changed, 89 insertions, 0 deletions

diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 2ac34b1..afc6c9a 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -168,6 +168,7 @@ namespace OpenSim.Framework.UserManagement
                         //logResponse.SimAddress = "127.0.0.1"; //overwritten
                         //logResponse.SimPort = 0; //overwritten
                         logResponse.Message = GetMessage();
+                        logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID)); 
 
                         try
                         {
@@ -265,6 +266,20 @@ namespace OpenSim.Framework.UserManagement
             return m_welcomeMessage;
         }
 
+        private LoginResponse.BuddyList ConvertFriendListItem(List<FriendListItem> LFL)
+        {
+            LoginResponse.BuddyList buddylistreturn = new LoginResponse.BuddyList();
+            foreach (FriendListItem fl in LFL)
+            {
+                LoginResponse.BuddyList.BuddyInfo buddyitem = new LoginResponse.BuddyList.BuddyInfo(fl.Friend);
+                buddyitem.BuddyID = fl.Friend;
+                buddyitem.BuddyRightsHave = (int)fl.FriendListOwnerPerms;
+                buddyitem.BuddyRightsGiven = (int) fl.FriendPerms;
+                buddylistreturn.AddNewBuddy(buddyitem);
+
+            }
+            return buddylistreturn;
+        }
         /// <summary>
         /// Converts the inventory library skeleton into the form required by the rpc request.
         /// </summary>
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index f913d2c..5d62e5e 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -197,6 +197,80 @@ namespace OpenSim.Framework.UserManagement
         }
 
         /// <summary>
+        /// Loads a user's friend list
+        /// </summary>
+        /// <param name="name">the UUID of the friend list owner</param>
+        /// <returns>A List of FriendListItems that contains info about the user's friends</returns>
+        public List<FriendListItem> GetUserFriendList(LLUUID ownerID)
+        {
+
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                    return plugin.Value.GetUserFriendList(ownerID);
+                }
+                catch (Exception e)
+                {
+                    MainLog.Instance.Verbose("USERSTORAGE",
+                                             "Unable to GetUserFriendList via " + plugin.Key + "(" + e.ToString() + ")");
+                }
+            }
+
+            return null;
+
+        }
+
+        public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms)
+        {
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                    plugin.Value.AddNewUserFriend(friendlistowner,friend,perms);
+                }
+                catch (Exception e)
+                {
+                    MainLog.Instance.Verbose("USERSTORAGE",
+                                             "Unable to AddNewUserFriend via " + plugin.Key + "(" + e.ToString() + ")");
+                }
+            }
+
+        }
+
+
+        public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend)
+        {
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                   plugin.Value.RemoveUserFriend(friendlistowner, friend);
+                }
+                catch (Exception e)
+                {
+                    MainLog.Instance.Verbose("USERSTORAGE",
+                                             "Unable to RemoveUserFriend via " + plugin.Key + "(" + e.ToString() + ")");
+                }
+            }
+        }
+
+        public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms)
+        {
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                    plugin.Value.UpdateUserFriendPerms(friendlistowner, friend, perms);
+                }
+                catch (Exception e)
+                {
+                    MainLog.Instance.Verbose("USERSTORAGE",
+                                             "Unable to UpdateUserFriendPerms via " + plugin.Key + "(" + e.ToString() + ")");
+                }
+            }
+        }
+        /// <summary>
         /// Loads a user agent by name (not called directly)
         /// </summary>
         /// <param name="name">The agent's name</param>