* Finished implementation of FriendsService.Delete

* Deny now working

2 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 34f14df..8f1b5d7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -391,7 +391,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         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;
 
             IClientAPI friendClient = LocateClientObject(friendID);
@@ -450,6 +451,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         private void OnDenyFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List<UUID> callingCardFolders)
         {
+            m_log.DebugFormat("[FRIENDS]: {0} denied friendship to {1}", agentID, friendID);
+
             FriendsService.Delete(agentID, friendID.ToString());
             FriendsService.Delete(friendID, agentID.ToString());
 
diff --git a/OpenSim/Services/Friends/FriendsService.cs b/OpenSim/Services/Friends/FriendsService.cs
index dc1e228..3c64ecc 100644
--- a/OpenSim/Services/Friends/FriendsService.cs
+++ b/OpenSim/Services/Friends/FriendsService.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Services.Friends
 
         public bool Delete(UUID PrincipalID, string Friend)
         {
-            return false;
+            return m_Database.Delete(PrincipalID, Friend);
         }
 
     }