OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster 

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
avinationmerge
Melanie 2013-06-07 23:09:53 +01:00
parent dd7404d850 346eda27cc
commit 45e333652c
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CONTRIBUTORS.txt
View File

@ -75,11 +75,12 @@ what it is today.
* controlbreak * controlbreak
* coyled * coyled
* Daedius * Daedius
* Dong Jun Lan (IBM)
* DoranZemlja
* daTwitch * daTwitch
* devalnor-#708 * devalnor-#708
* dmiles (Daxtron Labs) * dmiles (Daxtron Labs)
* Dong Jun Lan (IBM)
* DoranZemlja
* dr0b3rts
* dslake (Intel) * dslake (Intel)
* FredoChaplin * FredoChaplin
* Garmin Kawaguichi * Garmin Kawaguichi

2
OpenSim/Addons/Groups/GroupsModule.cs
View File

@ -347,7 +347,7 @@ namespace OpenSim.Groups
{ {
if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
m_log.DebugFormat("[Groups]: IM From {0} to {1} msg {2} type {3}", im.fromAgentID, im.toAgentID, im.message, (InstantMessageDialog)im.dialog); //m_log.DebugFormat("[Groups]: IM From {0} to {1} msg {2} type {3}", im.fromAgentID, im.toAgentID, im.message, (InstantMessageDialog)im.dialog);
// Group invitations // Group invitations
if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline)) if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline))
{ {

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();

3
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@ -222,8 +222,9 @@ namespace OpenSim.Region.Framework.Scenes
{ {
foreach (ulong handle in regionslst) foreach (ulong handle in regionslst)
{ {
ulong handleCopy = handle;
SendCloseChildAgentDelegate d = SendCloseChildAgentAsync; SendCloseChildAgentDelegate d = SendCloseChildAgentAsync;
d.BeginInvoke(agentID, handle, d.BeginInvoke(agentID, handleCopy,
SendCloseChildAgentCompleted, SendCloseChildAgentCompleted,
d); d);
} }