diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs index 9954749..ac05a6e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | |||
@@ -539,8 +539,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
539 | // m_log.DebugFormat("[HGFRIENDS MODULE] HG Friendship! thisUUI={0}; friendUUI={1}; foreignThisFriendService={2}; foreignFriendFriendService={3}", | 539 | // m_log.DebugFormat("[HGFRIENDS MODULE] HG Friendship! thisUUI={0}; friendUUI={1}; foreignThisFriendService={2}; foreignFriendFriendService={3}", |
540 | // agentUUI, friendUUI, agentFriendService, friendFriendService); | 540 | // agentUUI, friendUUI, agentFriendService, friendFriendService); |
541 | 541 | ||
542 | } | 542 | } |
543 | 543 | ||
544 | // Delete any previous friendship relations | 544 | // Delete any previous friendship relations |
545 | DeletePreviousRelations(agentID, friendID); | 545 | DeletePreviousRelations(agentID, friendID); |
546 | 546 | ||
@@ -641,11 +641,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
641 | FriendsService.Delete(a1, f.Friend); | 641 | FriendsService.Delete(a1, f.Friend); |
642 | // and also the converse | 642 | // and also the converse |
643 | FriendsService.Delete(f.Friend, a1.ToString()); | 643 | FriendsService.Delete(f.Friend, a1.ToString()); |
644 | } | 644 | } |
645 | } | 645 | } |
646 | } | 646 | } |
647 | } | 647 | } |
648 | 648 | ||
649 | finfos = GetFriendsFromCache(a1); | 649 | finfos = GetFriendsFromCache(a1); |
650 | if (finfos != null) | 650 | if (finfos != null) |
651 | { | 651 | { |
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
658 | FriendsService.Delete(a2, f.Friend); | 658 | FriendsService.Delete(a2, f.Friend); |
659 | // and also the converse | 659 | // and also the converse |
660 | FriendsService.Delete(f.Friend, a2.ToString()); | 660 | FriendsService.Delete(f.Friend, a2.ToString()); |
661 | } | 661 | } |
662 | } | 662 | } |
663 | } | 663 | } |
664 | } | 664 | } |
@@ -783,7 +783,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
783 | m_log.DebugFormat("[HGFRIENDS MODULE]: Forwading friendship from {0} to {1} @ {2}", agentID, friendID, friendsURL); | 783 | m_log.DebugFormat("[HGFRIENDS MODULE]: Forwading friendship from {0} to {1} @ {2}", agentID, friendID, friendsURL); |
784 | GridRegion region = new GridRegion(); | 784 | GridRegion region = new GridRegion(); |
785 | region.ServerURI = friendsURL; | 785 | region.ServerURI = friendsURL; |
786 | 786 | ||
787 | string name = im.fromAgentName; | 787 | string name = im.fromAgentName; |
788 | if (m_uMan.IsLocalGridUser(agentID)) | 788 | if (m_uMan.IsLocalGridUser(agentID)) |
789 | { | 789 | { |
@@ -815,7 +815,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
815 | } | 815 | } |
816 | 816 | ||
817 | m_HGFriendsConnector.FriendshipOffered(region, agentID, friendID, im.message, name); | 817 | m_HGFriendsConnector.FriendshipOffered(region, agentID, friendID, im.message, name); |
818 | 818 | ||
819 | return true; | 819 | return true; |
820 | } | 820 | } |
821 | } | 821 | } |