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

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
This commit is contained in:
Melanie
2013-06-07 23:09:53 +01:00
parent dd7404d850 346eda27cc
commit 45e333652c
5 changed files with 10 additions and 8 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
if (LocalFriendshipTerminated(exfriendID))
if (LocalFriendshipTerminated(client.AgentId, exfriendID))
return;
PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { exfriendID.ToString() });
@@ -827,13 +827,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
return false;
}
public bool LocalFriendshipTerminated(UUID exfriendID)
public bool LocalFriendshipTerminated(UUID userID, UUID exfriendID)
{
IClientAPI friendClient = LocateClientObject(exfriendID);
if (friendClient != null)
{
// the friend in this sim as root agent
friendClient.SendTerminateFriend(exfriendID);
friendClient.SendTerminateFriend(userID);
// update local cache
RecacheFriends(friendClient);
// 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))
return FailureResult();
if (m_FriendsModule.LocalFriendshipTerminated(toID))
if (m_FriendsModule.LocalFriendshipTerminated(fromID, toID))
return SuccessResult();
return FailureResult();