ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

In LocalFriendshipTerminated, send the original client's agentId to the friend being removed instead of the friend's own id.

Browse Source
This commit is contained in:
Donnie Roberts
2013-06-05 19:55:18 -04:00
committed by Justin Clark-Casey (justincc)
parent 25fa647a74
commit 045c26f626
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -685,7 +685,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
// //
// Try local // Try local
if (LocalFriendshipTerminated(exfriendID)) if (LocalFriendshipTerminated(client.AgentId, exfriendID))
return; return;
PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { exfriendID.ToString() }); PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { exfriendID.ToString() });
@@ -827,13 +827,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
return false; return false;
} }
public bool LocalFriendshipTerminated(UUID exfriendID) public bool LocalFriendshipTerminated(UUID userID, UUID exfriendID)
{ {
IClientAPI friendClient = LocateClientObject(exfriendID); IClientAPI friendClient = LocateClientObject(exfriendID);
if (friendClient != null) if (friendClient != null)
{ {
// the friend in this sim as root agent // the friend in this sim as root agent
friendClient.SendTerminateFriend(exfriendID); friendClient.SendTerminateFriend(userID);
// update local cache // update local cache
RecacheFriends(friendClient); RecacheFriends(friendClient);
// we're done // we're done

2
OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
View File

@@ -193,7 +193,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
if (!UUID.TryParse(request["ToID"].ToString(), out toID)) if (!UUID.TryParse(request["ToID"].ToString(), out toID))
return FailureResult(); return FailureResult();
if (m_FriendsModule.LocalFriendshipTerminated(toID)) if (m_FriendsModule.LocalFriendshipTerminated(fromID, toID))
return SuccessResult(); return SuccessResult();
return FailureResult(); return FailureResult();