diff options
author | Justin Clark-Casey (justincc) | 2012-03-30 01:57:38 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-30 01:57:38 +0100 |
commit | 3525c876c8972fb89a9981d4dc3dcb3220adee9e (patch) | |
tree | 3dd20361706859391f9a45c1b5e00dff8f94bf02 /OpenSim/Region/CoreModules/Avatar/Friends | |
parent | Lock NullFriendsData.m_Data for consistency and against concurrent read/write (diff) | |
download | opensim-SC_OLD-3525c876c8972fb89a9981d4dc3dcb3220adee9e.zip opensim-SC_OLD-3525c876c8972fb89a9981d4dc3dcb3220adee9e.tar.gz opensim-SC_OLD-3525c876c8972fb89a9981d4dc3dcb3220adee9e.tar.bz2 opensim-SC_OLD-3525c876c8972fb89a9981d4dc3dcb3220adee9e.tar.xz |
Make default "show friends" console command show friends fetched from the friends service.
There is no a --cache option which will show friends from the local cache if available.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 37e6600..f64c161 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
110 | } | 110 | } |
111 | } | 111 | } |
112 | 112 | ||
113 | protected IFriendsService FriendsService | 113 | public IFriendsService FriendsService |
114 | { | 114 | { |
115 | get | 115 | get |
116 | { | 116 | { |
@@ -939,7 +939,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
939 | } | 939 | } |
940 | } | 940 | } |
941 | 941 | ||
942 | protected virtual FriendInfo[] GetFriendsFromService(IClientAPI client) | 942 | public virtual FriendInfo[] GetFriendsFromService(IClientAPI client) |
943 | { | 943 | { |
944 | return FriendsService.GetFriends(client.AgentId); | 944 | return FriendsService.GetFriends(client.AgentId); |
945 | } | 945 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs index d3a3ee4..9a6d277 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | |||
@@ -300,8 +300,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
300 | return null; | 300 | return null; |
301 | } | 301 | } |
302 | 302 | ||
303 | 303 | public override FriendInfo[] GetFriendsFromService(IClientAPI client) | |
304 | protected override FriendInfo[] GetFriendsFromService(IClientAPI client) | ||
305 | { | 304 | { |
306 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name); | 305 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name); |
307 | Boolean agentIsLocal = true; | 306 | Boolean agentIsLocal = true; |