OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Finished implementation of FriendsService.Delete 

* Deny now working
slimupdates
Diva Canto 2010-02-27 10:57:57 -08:00
parent 3906a14857
commit a234672db8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
View File

@ -391,7 +391,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
private void ForwardFriendshipOffer(UUID agentID, UUID friendID, GridInstantMessage im) 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.imSessionID = im.fromAgentID;
IClientAPI friendClient = LocateClientObject(friendID); 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) 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(agentID, friendID.ToString());
FriendsService.Delete(friendID, agentID.ToString()); FriendsService.Delete(friendID, agentID.ToString());

2
OpenSim/Services/Friends/FriendsService.cs
View File

@ -78,7 +78,7 @@ namespace OpenSim.Services.Friends
public bool Delete(UUID PrincipalID, string Friend) public bool Delete(UUID PrincipalID, string Friend)
{ {
return false; return m_Database.Delete(PrincipalID, Friend);
} }
} }