aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Addons/Groups/GroupsModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs3
4 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index f805d69..5b3b9f6 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -347,7 +347,7 @@ namespace OpenSim.Groups
347 { 347 {
348 if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); 348 if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
349 349
350 m_log.DebugFormat("[Groups]: IM From {0} to {1} msg {2} type {3}", im.fromAgentID, im.toAgentID, im.message, (InstantMessageDialog)im.dialog); 350 //m_log.DebugFormat("[Groups]: IM From {0} to {1} msg {2} type {3}", im.fromAgentID, im.toAgentID, im.message, (InstantMessageDialog)im.dialog);
351 // Group invitations 351 // Group invitations
352 if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline)) 352 if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline))
353 { 353 {
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
685 // 685 //
686 686
687 // Try local 687 // Try local
688 if (LocalFriendshipTerminated(exfriendID)) 688 if (LocalFriendshipTerminated(client.AgentId, exfriendID))
689 return; 689 return;
690 690
691 PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { exfriendID.ToString() }); 691 PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { exfriendID.ToString() });
@@ -827,13 +827,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
827 return false; 827 return false;
828 } 828 }
829 829
830 public bool LocalFriendshipTerminated(UUID exfriendID) 830 public bool LocalFriendshipTerminated(UUID userID, UUID exfriendID)
831 { 831 {
832 IClientAPI friendClient = LocateClientObject(exfriendID); 832 IClientAPI friendClient = LocateClientObject(exfriendID);
833 if (friendClient != null) 833 if (friendClient != null)
834 { 834 {
835 // the friend in this sim as root agent 835 // the friend in this sim as root agent
836 friendClient.SendTerminateFriend(exfriendID); 836 friendClient.SendTerminateFriend(userID);
837 // update local cache 837 // update local cache
838 RecacheFriends(friendClient); 838 RecacheFriends(friendClient);
839 // we're done 839 // 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
193 if (!UUID.TryParse(request["ToID"].ToString(), out toID)) 193 if (!UUID.TryParse(request["ToID"].ToString(), out toID))
194 return FailureResult(); 194 return FailureResult();
195 195
196 if (m_FriendsModule.LocalFriendshipTerminated(toID)) 196 if (m_FriendsModule.LocalFriendshipTerminated(fromID, toID))
197 return SuccessResult(); 197 return SuccessResult();
198 198
199 return FailureResult(); 199 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
222 { 222 {
223 foreach (ulong handle in regionslst) 223 foreach (ulong handle in regionslst)
224 { 224 {
225 ulong handleCopy = handle;
225 SendCloseChildAgentDelegate d = SendCloseChildAgentAsync; 226 SendCloseChildAgentDelegate d = SendCloseChildAgentAsync;
226 d.BeginInvoke(agentID, handle, 227 d.BeginInvoke(agentID, handleCopy,
227 SendCloseChildAgentCompleted, 228 SendCloseChildAgentCompleted,
228 d); 229 d);
229 } 230 }