diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index aaa331b..7980de3 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
167 | m_Enabled = true; | 167 | m_Enabled = true; |
168 | m_log.DebugFormat("[FRIENDS MODULE]: {0} enabled.", Name); | 168 | m_log.DebugFormat("[FRIENDS MODULE]: {0} enabled.", Name); |
169 | } | 169 | } |
170 | } | 170 | } |
171 | } | 171 | } |
172 | 172 | ||
173 | protected virtual void InitModule(IConfigSource config) | 173 | protected virtual void InitModule(IConfigSource config) |
@@ -570,7 +570,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
570 | protected virtual void OnInstantMessage(IClientAPI client, GridInstantMessage im) | 570 | protected virtual void OnInstantMessage(IClientAPI client, GridInstantMessage im) |
571 | { | 571 | { |
572 | if ((InstantMessageDialog)im.dialog == InstantMessageDialog.FriendshipOffered) | 572 | if ((InstantMessageDialog)im.dialog == InstantMessageDialog.FriendshipOffered) |
573 | { | 573 | { |
574 | // we got a friendship offer | 574 | // we got a friendship offer |
575 | UUID principalID = new UUID(im.fromAgentID); | 575 | UUID principalID = new UUID(im.fromAgentID); |
576 | UUID friendID = new UUID(im.toAgentID); | 576 | UUID friendID = new UUID(im.toAgentID); |
@@ -605,7 +605,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
605 | im.imSessionID = im.fromAgentID; | 605 | im.imSessionID = im.fromAgentID; |
606 | im.fromAgentName = GetFriendshipRequesterName(agentID); | 606 | im.fromAgentName = GetFriendshipRequesterName(agentID); |
607 | 607 | ||
608 | // Try the local sim | 608 | // Try the local sim |
609 | if (LocalFriendshipOffered(friendID, im)) | 609 | if (LocalFriendshipOffered(friendID, im)) |
610 | return true; | 610 | return true; |
611 | 611 | ||
@@ -648,7 +648,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
648 | ccm.CreateCallingCard(client.AgentId, friendID, UUID.Zero); | 648 | ccm.CreateCallingCard(client.AgentId, friendID, UUID.Zero); |
649 | } | 649 | } |
650 | 650 | ||
651 | // Update the local cache. | 651 | // Update the local cache. |
652 | RecacheFriends(client); | 652 | RecacheFriends(client); |
653 | 653 | ||
654 | // | 654 | // |
@@ -704,7 +704,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
704 | } | 704 | } |
705 | } | 705 | } |
706 | } | 706 | } |
707 | 707 | ||
708 | public void RemoveFriendship(IClientAPI client, UUID exfriendID) | 708 | public void RemoveFriendship(IClientAPI client, UUID exfriendID) |
709 | { | 709 | { |
710 | if (!DeleteFriendship(client.AgentId, exfriendID)) | 710 | if (!DeleteFriendship(client.AgentId, exfriendID)) |
@@ -732,7 +732,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
732 | GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID); | 732 | GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID); |
733 | m_FriendsSimConnector.FriendshipTerminated(region, client.AgentId, exfriendID); | 733 | m_FriendsSimConnector.FriendshipTerminated(region, client.AgentId, exfriendID); |
734 | } | 734 | } |
735 | } | 735 | } |
736 | } | 736 | } |
737 | 737 | ||
738 | public void FindFriend(IClientAPI remoteClient,UUID HunterID ,UUID PreyID) | 738 | public void FindFriend(IClientAPI remoteClient,UUID HunterID ,UUID PreyID) |
@@ -740,7 +740,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
740 | UUID requester = remoteClient.AgentId; | 740 | UUID requester = remoteClient.AgentId; |
741 | if(requester != HunterID) // only allow client agent to be the hunter (?) | 741 | if(requester != HunterID) // only allow client agent to be the hunter (?) |
742 | return; | 742 | return; |
743 | 743 | ||
744 | FriendInfo[] friends = GetFriendsFromCache(requester); | 744 | FriendInfo[] friends = GetFriendsFromCache(requester); |
745 | if (friends.Length == 0) | 745 | if (friends.Length == 0) |
746 | return; | 746 | return; |
@@ -773,7 +773,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
773 | } | 773 | } |
774 | 774 | ||
775 | PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { PreyID.ToString() }); | 775 | PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { PreyID.ToString() }); |
776 | 776 | ||
777 | if (friendSessions == null || friendSessions.Length == 0) | 777 | if (friendSessions == null || friendSessions.Length == 0) |
778 | return; | 778 | return; |
779 | 779 | ||