HG Friends working to some extent: friendships offered and accepted correctly handled. Friends list showing correct foreign names. TODO: GrantRights.

4 files changed, 553 insertions, 39 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 5baf078..21cd924 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -49,6 +49,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
     public class FriendsModule : ISharedRegionModule, IFriendsModule
     {
+        protected bool m_Enabled = false;
+
         protected class UserFriendData
         {
             public UUID PrincipalID;
@@ -130,8 +132,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             }
         }
 
+        #region ISharedRegionModule
         public void Initialise(IConfigSource config)
         {
+            IConfig moduleConfig = config.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                string name = moduleConfig.GetString("FriendsModule", "FriendsModule");
+                m_log.DebugFormat("[XXX] {0} compared to {1}", name, Name);
+                if (name == Name)
+                {
+                    InitModule(config);
+
+                    m_Enabled = true;
+                    m_log.InfoFormat("[FRIENDS MODULE]: {0} enabled.", Name);
+                }
+            }            
+        }
+
+        protected void InitModule(IConfigSource config)
+        {
             IConfig friendsConfig = config.Configs["Friends"];
             if (friendsConfig != null)
             {
@@ -153,7 +173,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 m_log.Error("[FRIENDS]: No Connector defined in section Friends, or failed to load, cannot continue");
                 throw new Exception("Connector load error");
             }
-
         }
 
         public void PostInitialise()
@@ -166,6 +185,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         public void AddRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             m_Scenes.Add(scene);
             scene.RegisterModuleInterface<IFriendsModule>(this);
 
@@ -181,10 +203,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         public void RemoveRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             m_Scenes.Remove(scene);
         }
 
-        public string Name
+        public virtual string Name
         {
             get { return "FriendsModule"; }
         }
@@ -194,6 +219,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             get { return null; }
         }
 
+        #endregion
+
         public uint GetFriendPerms(UUID principalID, UUID friendID)
         {
             FriendInfo[] friends = GetFriends(principalID);
@@ -214,30 +241,33 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             client.OnTerminateFriendship += OnTerminateFriendship;
             client.OnGrantUserRights += OnGrantUserRights;
 
-            // Asynchronously fetch the friends list or increment the refcount for the existing 
-            // friends list
-            Util.FireAndForget(
-                delegate(object o)
+            Util.FireAndForget(delegate { FetchFriendslist(client.AgentId); });
+        }
+
+        /// Fetch the friends list or increment the refcount for the existing 
+        /// friends list
+        /// Returns true if the list was fetched, false if it wasn't
+        protected virtual bool FetchFriendslist(UUID agentID)
+        {
+            lock (m_Friends)
+            {
+                UserFriendData friendsData;
+                if (m_Friends.TryGetValue(agentID, out friendsData))
                 {
-                    lock (m_Friends)
-                    {
-                        UserFriendData friendsData;
-                        if (m_Friends.TryGetValue(client.AgentId, out friendsData))
-                        {
-                            friendsData.Refcount++;
-                        }
-                        else
-                        {
-                            friendsData = new UserFriendData();
-                            friendsData.PrincipalID = client.AgentId;
-                            friendsData.Friends = FriendsService.GetFriends(client.AgentId);
-                            friendsData.Refcount = 1;
+                    friendsData.Refcount++;
+                    return false;
+                }
+                else
+                {
+                    friendsData = new UserFriendData();
+                    friendsData.PrincipalID = agentID;
+                    friendsData.Friends = FriendsService.GetFriends(agentID);
+                    friendsData.Refcount = 1;
 
-                            m_Friends[client.AgentId] = friendsData;
-                        }
-                    }
+                    m_Friends[agentID] = friendsData;
+                    return true;
                 }
-            );
+            }
         }
 
         private void OnClientClosed(UUID agentID, Scene scene)
@@ -313,10 +343,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             foreach (string fid in outstanding)
             {
                 UUID fromAgentID;
-                if (!UUID.TryParse(fid, out fromAgentID))
+                string firstname = "Unknown", lastname = "User";
+                if (!GetAgentInfo(client.Scene.RegionInfo.ScopeID, fid, out fromAgentID, out firstname, out lastname))
+                {
+                    m_log.DebugFormat("[FRIENDS MODULE]: skipping malformed friend {0}", fid);
                     continue;
-
-                UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, fromAgentID);
+                }
 
                 PresenceInfo presence = null;
                 PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid });
@@ -326,15 +358,37 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     im.offline = 0;
 
                 im.fromAgentID = fromAgentID.Guid;
-                im.fromAgentName = account.FirstName + " " + account.LastName;
+                im.fromAgentName = firstname + " " + lastname;
                 im.offline = (byte)((presence == null) ? 1 : 0);
                 im.imSessionID = im.fromAgentID;
+                im.message = FriendshipMessage(fid);
 
                 // Finally
                 LocalFriendshipOffered(agentID, im);
             }
         }
 
+        protected virtual string FriendshipMessage(string friendID)
+        {
+            return "Will you be my friend?";
+        }
+
+        protected virtual bool GetAgentInfo(UUID scopeID, string fid, out UUID agentID, out string first, out string last)
+        {
+            first = "Unknown"; last = "User";
+            if (!UUID.TryParse(fid, out agentID))
+                return false;
+
+            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(scopeID, agentID);
+            if (account != null)
+            {
+                first = account.FirstName;
+                last = account.LastName;
+            }
+
+            return true;
+        }
+
         List<UUID> GetOnlineFriends(UUID userID)
         {
             List<string> friendList = new List<string>();
@@ -475,23 +529,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
                 // This user wants to be friends with the other user.
                 // Let's add the relation backwards, in case the other is not online
-                FriendsService.StoreFriend(friendID, principalID.ToString(), 0);
+                StoreBackwards(friendID, principalID);
 
                 // Now let's ask the other user to be friends with this user
                 ForwardFriendshipOffer(principalID, friendID, im);
             }
         }
 
+        protected virtual void StoreBackwards(UUID friendID, UUID agentID)
+        {
+            FriendsService.StoreFriend(friendID.ToString(), agentID.ToString(), 0);
+        }
+
         private void ForwardFriendshipOffer(UUID agentID, UUID friendID, GridInstantMessage im)
         {
             // !!!!!!!! This is a hack so that we don't have to keep state (transactionID/imSessionID)
             // We stick this agent's ID as imSession, so that it's directly available on the receiving end
             im.imSessionID = im.fromAgentID;
+            im.fromAgentName = GetFriendshipRequesterName(agentID);
 
-            // Try the local sim
-            UserAccount account = UserAccountService.GetUserAccount(UUID.Zero, agentID);
-            im.fromAgentName = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName;
-            
+            // Try the local sim            
             if (LocalFriendshipOffered(friendID, im))
                 return;
 
@@ -509,12 +566,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             // If the prospective friend is not online, he'll get the message upon login.
         }
 
+        protected virtual string GetFriendshipRequesterName(UUID agentID)
+        {
+            UserAccount account = UserAccountService.GetUserAccount(UUID.Zero, agentID);
+            return (account == null) ? "Unknown" : account.FirstName + " " + account.LastName;
+        }
+
         private void OnApproveFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List<UUID> callingCardFolders)
         {
             m_log.DebugFormat("[FRIENDS]: {0} accepted friendship from {1}", agentID, friendID);
-            
-            FriendsService.StoreFriend(agentID, friendID.ToString(), 1);
-            FriendsService.StoreFriend(friendID, agentID.ToString(), 1);
+
+            StoreFriendships(agentID, friendID);
 
             // Update the local cache
             UpdateFriendsCache(agentID);
@@ -544,6 +606,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             }
         }
 
+        protected virtual void StoreFriendships(UUID agentID, UUID friendID)
+        {
+            FriendsService.StoreFriend(agentID.ToString(), friendID.ToString(), 1);
+            FriendsService.StoreFriend(friendID.ToString(), agentID.ToString(), 1);
+        }
+
         private void OnDenyFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List<UUID> callingCardFolders)
         {
             m_log.DebugFormat("[FRIENDS]: {0} denied friendship to {1}", agentID, friendID);
@@ -576,8 +644,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         private void OnTerminateFriendship(IClientAPI client, UUID agentID, UUID exfriendID)
         {
-            FriendsService.Delete(agentID, exfriendID.ToString());
-            FriendsService.Delete(exfriendID, agentID.ToString());
+            DeleteFriendship(agentID, exfriendID);
 
             // Update local cache
             UpdateFriendsCache(agentID);
@@ -604,6 +671,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             }
         }
 
+        protected virtual void DeleteFriendship(UUID agentID, UUID exfriendID)
+        {
+            FriendsService.Delete(agentID, exfriendID.ToString());
+            FriendsService.Delete(exfriendID, agentID.ToString());
+        }
+
         private void OnGrantUserRights(IClientAPI remoteClient, UUID requester, UUID target, int rights)
         {
             FriendInfo[] friends = GetFriends(remoteClient.AgentId);
@@ -622,7 +695,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             if (friend != null) // Found it
             {
                 // Store it on the DB
-                FriendsService.StoreFriend(requester, target.ToString(), rights);
+                FriendsService.StoreFriend(requester.ToString(), target.ToString(), rights);
 
                 // Store it in the local cache
                 int myFlags = friend.MyFlags;
@@ -780,7 +853,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         #endregion
 
-        private FriendInfo[] GetFriends(UUID agentID)
+        protected FriendInfo[] GetFriends(UUID agentID)
         {
             UserFriendData friendsData;
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
new file mode 100644
index 0000000..645ecdc
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -0,0 +1,438 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using Nini.Config;
+using Nwc.XmlRpc;
+using Mono.Addins;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors.Hypergrid;
+using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;
+using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+namespace OpenSim.Region.CoreModules.Avatar.Friends
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class HGFriendsModule : FriendsModule, ISharedRegionModule, IFriendsModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        #region ISharedRegionModule
+        public override string Name
+        {
+            get { return "HGFriendsModule"; }
+        }
+
+        #endregion
+
+        //public void SendFriendsOnlineIfNeeded(IClientAPI client)
+        //{
+        //    UUID agentID = client.AgentId;
+
+        //    // Check if the online friends list is needed
+        //    lock (m_NeedsListOfFriends)
+        //    {
+        //        if (!m_NeedsListOfFriends.Remove(agentID))
+        //            return;
+        //    }
+
+        //    // Send the friends online
+        //    List<UUID> online = GetOnlineFriends(agentID);
+        //    if (online.Count > 0)
+        //    {
+        //        m_log.DebugFormat("[FRIENDS MODULE]: User {0} in region {1} has {2} friends online", client.AgentId, client.Scene.RegionInfo.RegionName, online.Count);
+        //        client.SendAgentOnline(online.ToArray());
+        //    }
+
+        //    // Send outstanding friendship offers
+        //    List<string> outstanding = new List<string>();
+        //    FriendInfo[] friends = GetFriends(agentID);
+        //    foreach (FriendInfo fi in friends)
+        //    {
+        //        if (fi.TheirFlags == -1)
+        //            outstanding.Add(fi.Friend);
+        //    }
+
+        //    GridInstantMessage im = new GridInstantMessage(client.Scene, UUID.Zero, String.Empty, agentID, (byte)InstantMessageDialog.FriendshipOffered,
+        //        "Will you be my friend?", true, Vector3.Zero);
+
+        //    foreach (string fid in outstanding)
+        //    {
+        //        UUID fromAgentID;
+        //        if (!UUID.TryParse(fid, out fromAgentID))
+        //            continue;
+
+        //        UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, fromAgentID);
+
+        //        PresenceInfo presence = null;
+        //        PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid });
+        //        if (presences != null && presences.Length > 0)
+        //            presence = presences[0];
+        //        if (presence != null)
+        //            im.offline = 0;
+
+        //        im.fromAgentID = fromAgentID.Guid;
+        //        im.fromAgentName = account.FirstName + " " + account.LastName;
+        //        im.offline = (byte)((presence == null) ? 1 : 0);
+        //        im.imSessionID = im.fromAgentID;
+
+        //        // Finally
+        //        LocalFriendshipOffered(agentID, im);
+        //    }
+        //}
+
+        //List<UUID> GetOnlineFriends(UUID userID)
+        //{
+        //    List<string> friendList = new List<string>();
+        //    List<UUID> online = new List<UUID>();
+
+        //    FriendInfo[] friends = GetFriends(userID);
+        //    foreach (FriendInfo fi in friends)
+        //    {
+        //        if (((fi.TheirFlags & 1) != 0) && (fi.TheirFlags != -1))
+        //            friendList.Add(fi.Friend);
+        //    }
+
+        //    if (friendList.Count > 0)
+        //    {
+        //        PresenceInfo[] presence = PresenceService.GetAgents(friendList.ToArray());
+        //        foreach (PresenceInfo pi in presence)
+        //        {
+        //            UUID presenceID;
+        //            if (UUID.TryParse(pi.UserID, out presenceID))
+        //                online.Add(presenceID);
+        //        }
+        //    }
+
+        //    return online;
+        //}
+
+        //private void StatusNotify(FriendInfo friend, UUID userID, bool online)
+        //{
+        //    UUID friendID;
+        //    if (UUID.TryParse(friend.Friend, out friendID))
+        //    {
+        //        // Try local
+        //        if (LocalStatusNotification(userID, friendID, online))
+        //            return;
+
+        //        // The friend is not here [as root]. Let's forward.
+        //        PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() });
+        //        if (friendSessions != null && friendSessions.Length > 0)
+        //        {
+        //            PresenceInfo friendSession = null; 
+        //            foreach (PresenceInfo pinfo in friendSessions)
+        //                if (pinfo.RegionID != UUID.Zero) // let's guard against sessions-gone-bad
+        //                {
+        //                    friendSession = pinfo;
+        //                    break;
+        //                }
+
+        //            if (friendSession != null)
+        //            {
+        //                GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
+        //                //m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName);
+        //                m_FriendsSimConnector.StatusNotify(region, userID, friendID, online);
+        //            }
+        //        }
+
+        //        // Friend is not online. Ignore.
+        //    }
+        //    else
+        //    {
+        //        m_log.WarnFormat("[FRIENDS]: Error parsing friend ID {0}", friend.Friend);
+        //    }
+        //}
+
+        protected override bool FetchFriendslist(UUID agentID)
+        {
+            if (base.FetchFriendslist(agentID))
+            {
+                // We need to preload the user management cache with the names
+                // of foreign friends, just like we do with SOPs' creators
+                foreach (FriendInfo finfo in m_Friends[agentID].Friends)
+                {
+                    if (finfo.TheirFlags != -1)
+                    {
+                        UUID id;
+                        if (!UUID.TryParse(finfo.Friend, out id))
+                        {
+                            string url = string.Empty, first = string.Empty, last = string.Empty;
+                            if (Util.ParseUniversalUserIdentifier(finfo.Friend, out id, out url, out first, out last))
+                            {
+                                IUserManagement uMan = m_Scenes[0].RequestModuleInterface<IUserManagement>();
+                                uMan.AddUser(id, url + ";" + first + " " + last);
+                            }
+                        }
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+
+        protected override bool GetAgentInfo(UUID scopeID, string fid, out UUID agentID, out string first, out string last)
+        {
+            first = "Unknown"; last = "User";
+            if (base.GetAgentInfo(scopeID, fid, out agentID, out first, out last))
+                return true;
+
+            // fid is not a UUID...
+            string url = string.Empty;
+            if (Util.ParseUniversalUserIdentifier(fid, out agentID, out url, out first, out last))
+            {
+                IUserManagement userMan = m_Scenes[0].RequestModuleInterface<IUserManagement>();
+                userMan.AddUser(agentID, url + ";" + first + " " + last);
+
+                try // our best
+                {
+                    string[] parts = userMan.GetUserName(agentID).Split();
+                    first = parts[0];
+                    last = parts[1];
+                }
+                catch { }
+                return true;
+            }
+            return false;
+        }
+
+        protected override string GetFriendshipRequesterName(UUID agentID)
+        {
+            // For the time being we assume that HG friendship requests can only happen 
+            // when avies are on the same region.
+            IClientAPI client = LocateClientObject(agentID);
+            if (client != null)
+                return client.FirstName + " " + client.LastName;
+            else
+                return base.GetFriendshipRequesterName(agentID);
+        }
+
+        protected override string FriendshipMessage(string friendID)
+        {
+            UUID id;
+            if (UUID.TryParse(friendID, out id))
+                return base.FriendshipMessage(friendID);
+
+            return "Please confirm this friendship you made while you were away.";
+        }
+
+        protected override void StoreBackwards(UUID friendID, UUID agentID)
+        {
+            UserAccount account1 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, agentID);
+            UserAccount account2 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, friendID);
+            // Are they both local users?
+            if (account1 != null && account2 != null)
+            {
+                // local grid users
+                m_log.DebugFormat("[HGFRIENDS MODULE]: Users are both local");
+                base.StoreBackwards(friendID, agentID);
+                return;
+            }
+
+            // no provision for this temporary friendship state
+            //FriendsService.StoreFriend(friendID.ToString(), agentID.ToString(), 0);
+        }
+
+        protected override void StoreFriendships(UUID agentID, UUID friendID)
+        {
+            UserAccount agentAccount = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, agentID);
+            UserAccount friendAccount = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, friendID);
+            // Are they both local users?
+            if (agentAccount != null && friendAccount != null)
+            {
+                // local grid users
+                m_log.DebugFormat("[HGFRIENDS MODULE]: Users are both local");
+                base.StoreFriendships(agentID, friendID);
+                return;
+            }
+
+
+            // ok, at least one of them is foreigner, let's get their data
+            IClientAPI agentClient = LocateClientObject(agentID);
+            IClientAPI friendClient = LocateClientObject(friendID);
+            AgentCircuitData agentClientCircuit = null;
+            AgentCircuitData friendClientCircuit = null;
+            string agentUUI = string.Empty;
+            string friendUUI = string.Empty;
+            string agentFriendService = string.Empty;
+            string friendFriendService = string.Empty;
+
+            if (agentClient != null)
+            {
+                agentClientCircuit = ((Scene)(agentClient.Scene)).AuthenticateHandler.GetAgentCircuitData(agentClient.CircuitCode);
+                agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit);
+                agentFriendService = agentClientCircuit.ServiceURLs["FriendsServerURI"].ToString();
+            }
+            if (friendClient != null)
+            {
+                friendClientCircuit = ((Scene)(friendClient.Scene)).AuthenticateHandler.GetAgentCircuitData(friendClient.CircuitCode);
+                friendUUI = Util.ProduceUserUniversalIdentifier(friendClientCircuit);
+                friendFriendService = friendClientCircuit.ServiceURLs["FriendsServerURI"].ToString();
+            }
+
+            m_log.DebugFormat("[XXX] HG Friendship! thisUUI={0}; friendUUI={1}; foreignThisFriendService={2}; foreignFriendFriendService={3}",
+                    agentUUI, friendUUI, agentFriendService, friendFriendService);
+
+            if (agentAccount != null) // agent is local, 'friend' is foreigner
+            {
+                // This may happen when the agent returned home, in which case the friend is not there
+                // We need to llok for its information in the friends list itself
+                if (friendUUI == string.Empty)
+                {
+                    FriendInfo[] finfos = GetFriends(agentID);
+                    foreach (FriendInfo finfo in finfos)
+                    {
+                        if (finfo.TheirFlags == -1)
+                        {
+                            if (finfo.Friend.StartsWith(friendID.ToString()))
+                                friendUUI = finfo.Friend;
+                        }
+                    }
+                }
+
+                // store in the local friends service a reference to the foreign friend
+                FriendsService.StoreFriend(agentID.ToString(), friendUUI, 1);
+                // and also the converse
+                FriendsService.StoreFriend(friendUUI, agentID.ToString(), 1);
+
+                if (friendClientCircuit != null)
+                {
+                    // store in the foreign friends service a reference to the local agent
+                    HGFriendsServicesConnector friendsConn = new HGFriendsServicesConnector(friendFriendService, friendClientCircuit.SessionID, friendClientCircuit.ServiceSessionID);
+                    friendsConn.NewFriendship(friendID, agentUUI);
+                }
+            }
+            else if (friendAccount != null) // 'friend' is local,  agent is foreigner
+            {
+                // store in the local friends service a reference to the foreign agent
+                FriendsService.StoreFriend(friendID.ToString(), agentUUI, 1);
+                // and also the converse
+                FriendsService.StoreFriend(agentUUI, friendID.ToString(), 1);
+
+                if (agentClientCircuit != null)
+                {
+                    // store in the foreign friends service a reference to the local agent
+                    HGFriendsServicesConnector friendsConn = new HGFriendsServicesConnector(agentFriendService, agentClientCircuit.SessionID, agentClientCircuit.ServiceSessionID);
+                    friendsConn.NewFriendship(agentID, friendUUI);
+                }
+            }
+            else // They're both foreigners!
+            {
+                HGFriendsServicesConnector friendsConn;
+                if (agentClientCircuit != null)
+                {
+                    friendsConn = new HGFriendsServicesConnector(agentFriendService, agentClientCircuit.SessionID, agentClientCircuit.ServiceSessionID);
+                    friendsConn.NewFriendship(agentID, friendUUI);
+                }
+                if (friendClientCircuit != null)
+                {
+                    friendsConn = new HGFriendsServicesConnector(friendFriendService, friendClientCircuit.SessionID, friendClientCircuit.ServiceSessionID);
+                    friendsConn.NewFriendship(friendID, agentUUI);
+                }
+            }
+            // my brain hurts now
+        }
+
+        protected override void DeleteFriendship(UUID agentID, UUID exfriendID)
+        {
+            base.DeleteFriendship(agentID, exfriendID);
+            // Maybe some of the base deletes will fail.
+            // Let's delete the local friendship with foreign friend
+            FriendInfo[] friends = GetFriends(agentID);
+            foreach (FriendInfo finfo in friends)
+            {
+                if (finfo.Friend != exfriendID.ToString() && finfo.Friend.EndsWith(exfriendID.ToString()))
+                {
+                    FriendsService.Delete(agentID, exfriendID.ToString());
+                    // TODO: delete the friendship on the other side
+                    // Should use the homeurl given in finfo.Friend
+                }
+            }
+        }
+
+        //private void OnGrantUserRights(IClientAPI remoteClient, UUID requester, UUID target, int rights)
+        //{
+        //    FriendInfo[] friends = GetFriends(remoteClient.AgentId);
+        //    if (friends.Length == 0)
+        //        return;
+
+        //    m_log.DebugFormat("[FRIENDS MODULE]: User {0} changing rights to {1} for friend {2}", requester, rights, target);
+        //    // Let's find the friend in this user's friend list
+        //    FriendInfo friend = null;
+        //    foreach (FriendInfo fi in friends)
+        //    {
+        //        if (fi.Friend == target.ToString())
+        //            friend = fi;
+        //    }
+
+        //    if (friend != null) // Found it
+        //    {
+        //        // Store it on the DB
+        //        FriendsService.StoreFriend(requester, target.ToString(), rights);
+
+        //        // Store it in the local cache
+        //        int myFlags = friend.MyFlags;
+        //        friend.MyFlags = rights;
+
+        //        // Always send this back to the original client
+        //        remoteClient.SendChangeUserRights(requester, target, rights);
+
+        //        //
+        //        // Notify the friend
+        //        //
+
+        //        // Try local
+        //        if (LocalGrantRights(requester, target, myFlags, rights))
+        //            return;
+
+        //        PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { target.ToString() });
+        //        if (friendSessions != null && friendSessions.Length > 0)
+        //        {
+        //            PresenceInfo friendSession = friendSessions[0];
+        //            if (friendSession != null)
+        //            {
+        //                GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
+        //                // TODO: You might want to send the delta to save the lookup
+        //                // on the other end!!
+        //                m_FriendsSimConnector.GrantRights(region, requester, target, myFlags, rights);
+        //            }
+        //        }
+        //    }
+        //}
+
+
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 4cc6905..795de09 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -141,6 +141,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
         {
+            m_log.DebugFormat("[XXX] HandleUUIDNameRequest {0}", uuid);
             if (m_Scenes[0].LibraryService != null && (m_Scenes[0].LibraryService.LibraryRootFolder.Owner == uuid))
             {
                 remote_client.SendNameReply(uuid, "Mr", "OpenSim");
@@ -210,6 +211,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public string GetUserName(UUID uuid)
         {
+            m_log.DebugFormat("[XXX] GetUserName {0}", uuid);
             string[] names = GetUserNames(uuid);
             if (names.Length == 2)
             {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
index d2343c9..f5b6817 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
@@ -115,6 +115,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
 
                 new UserAgentServerConnector(m_Config, MainServer.Instance);
                 new HeloServiceInConnector(m_Config, MainServer.Instance, "HeloService");
+                new HGFriendsServerConnector(m_Config, MainServer.Instance, "HGFriendsService");
             }
             scene.RegisterModuleInterface<IGatekeeperService>(m_HypergridHandler.GateKeeper);
         }