diff options
| author | Justin Clark-Casey (justincc) | 2009-11-05 18:53:57 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-05 18:53:57 +0000 |
| commit | bae03dfcbd9ad8aa2c6a0366f0e387a358317a9d (patch) | |
| tree | 231e38c0e74afae0032a200b662be13383c63e13 /OpenSim/Region/CoreModules/Avatar | |
| parent | * Escape / character when saving items and folders in an iar so that the load... (diff) | |
| parent | Change the permissions module to use the friend list cache already in the (diff) | |
| download | opensim-SC-bae03dfcbd9ad8aa2c6a0366f0e387a358317a9d.zip opensim-SC-bae03dfcbd9ad8aa2c6a0366f0e387a358317a9d.tar.gz opensim-SC-bae03dfcbd9ad8aa2c6a0366f0e387a358317a9d.tar.bz2 opensim-SC-bae03dfcbd9ad8aa2c6a0366f0e387a358317a9d.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index c6fd72e..bb4e032 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
| @@ -1114,6 +1114,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
| 1114 | { | 1114 | { |
| 1115 | ((Scene)remoteClient.Scene).CommsManager.UpdateUserFriendPerms(requester, target, (uint)rights); | 1115 | ((Scene)remoteClient.Scene).CommsManager.UpdateUserFriendPerms(requester, target, (uint)rights); |
| 1116 | } | 1116 | } |
| 1117 | |||
| 1118 | public List<FriendListItem> GetUserFriends(UUID agentID) | ||
| 1119 | { | ||
| 1120 | List<FriendListItem> fl; | ||
| 1121 | lock (m_friendLists) | ||
| 1122 | { | ||
| 1123 | fl = (List<FriendListItem>)m_friendLists.Get(agentID.ToString(), | ||
| 1124 | m_initialScene.GetFriendList); | ||
| 1125 | } | ||
| 1126 | |||
| 1127 | return fl; | ||
| 1128 | } | ||
| 1117 | } | 1129 | } |
| 1118 | #endregion | 1130 | #endregion |
| 1119 | } | 1131 | } |