Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs

3 files changed, 6 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 4613344..41ea2a2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -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
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index 637beef..08196f1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -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();
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 775a4c2..df61dde 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -222,8 +222,9 @@ namespace OpenSim.Region.Framework.Scenes
         {
             foreach (ulong handle in regionslst)
             {
+                ulong handleCopy = handle;
                 SendCloseChildAgentDelegate d = SendCloseChildAgentAsync;
-                d.BeginInvoke(agentID, handle,
+                d.BeginInvoke(agentID, handleCopy,
                               SendCloseChildAgentCompleted,
                               d);
             }