aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-30 01:57:38 +0100
committerJustin Clark-Casey (justincc)2012-03-30 01:57:38 +0100
commit3525c876c8972fb89a9981d4dc3dcb3220adee9e (patch)
tree3dd20361706859391f9a45c1b5e00dff8f94bf02 /OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
parentLock NullFriendsData.m_Data for consistency and against concurrent read/write (diff)
downloadopensim-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/FriendsModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs4
1 files changed, 2 insertions, 2 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 }