From bfcc57c0712170e3431617bcb09999bfbb96b8dd Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 1 Mar 2010 00:02:14 +0000 Subject: Change friends to handle offers as it was originally designed. This may need to be changed in SQLite & MSSQL as well --- OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs') diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 3a86a46..32c2a43 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs @@ -194,10 +194,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends get { return null; } } - public void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage) - { - } - public uint GetFriendPerms(UUID principalID, UUID friendID) { if (!m_Friends.ContainsKey(principalID)) @@ -453,8 +449,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends // This user wants to be friends with the other user. // Let's add both relations to the DB, but one of them is inactive (-1) - FriendsService.StoreFriend(principalID, friendID.ToString(), 1); - FriendsService.StoreFriend(friendID, principalID.ToString(), -1); + FriendsService.StoreFriend(principalID, friendID.ToString(), 0); // Now let's ask the other user to be friends with this user ForwardFriendshipOffer(principalID, friendID, im); @@ -486,6 +481,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends private void OnApproveFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List callingCardFolders) { FriendsService.StoreFriend(agentID, friendID.ToString(), 1); + FriendsService.StoreFriend(friendID, agentID.ToString(), 1); // update the local cache m_Friends[agentID].Friends = FriendsService.GetFriends(agentID); -- cgit v1.1