aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-02-27 10:57:57 -0800
committerDiva Canto2010-02-27 10:57:57 -0800
commita234672db8190cea2e31f2a09b8a93fa26557d96 (patch)
tree18eb0f2dfc4f04457716f85c4b82cd97899ac7d3
parentFriends online notifications upon friendship now working (same sim only). (diff)
downloadopensim-SC-a234672db8190cea2e31f2a09b8a93fa26557d96.zip
opensim-SC-a234672db8190cea2e31f2a09b8a93fa26557d96.tar.gz
opensim-SC-a234672db8190cea2e31f2a09b8a93fa26557d96.tar.bz2
opensim-SC-a234672db8190cea2e31f2a09b8a93fa26557d96.tar.xz
* Finished implementation of FriendsService.Delete
* Deny now working
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs5
-rw-r--r--OpenSim/Services/Friends/FriendsService.cs2
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
391 391
392 private void ForwardFriendshipOffer(UUID agentID, UUID friendID, GridInstantMessage im) 392 private void ForwardFriendshipOffer(UUID agentID, UUID friendID, GridInstantMessage im)
393 { 393 {
394 // !!!!!!!! 394 // !!!!!!!! This is a hack so that we don't have to keep state (transactionID/imSessionID)
395 // We stick this agent's ID as imSession, so that it's directly available on the receiving end
395 im.imSessionID = im.fromAgentID; 396 im.imSessionID = im.fromAgentID;
396 397
397 IClientAPI friendClient = LocateClientObject(friendID); 398 IClientAPI friendClient = LocateClientObject(friendID);
@@ -450,6 +451,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
450 451
451 private void OnDenyFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List<UUID> callingCardFolders) 452 private void OnDenyFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List<UUID> callingCardFolders)
452 { 453 {
454 m_log.DebugFormat("[FRIENDS]: {0} denied friendship to {1}", agentID, friendID);
455
453 FriendsService.Delete(agentID, friendID.ToString()); 456 FriendsService.Delete(agentID, friendID.ToString());
454 FriendsService.Delete(friendID, agentID.ToString()); 457 FriendsService.Delete(friendID, agentID.ToString());
455 458
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
78 78
79 public bool Delete(UUID PrincipalID, string Friend) 79 public bool Delete(UUID PrincipalID, string Friend)
80 { 80 {
81 return false; 81 return m_Database.Delete(PrincipalID, Friend);
82 } 82 }
83 83
84 } 84 }