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/Framework/Interfaces | |
| 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_OLD-bae03dfcbd9ad8aa2c6a0366f0e387a358317a9d.zip opensim-SC_OLD-bae03dfcbd9ad8aa2c6a0366f0e387a358317a9d.tar.gz opensim-SC_OLD-bae03dfcbd9ad8aa2c6a0366f0e387a358317a9d.tar.bz2 opensim-SC_OLD-bae03dfcbd9ad8aa2c6a0366f0e387a358317a9d.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IFriendsModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs index 7a8aba2..8386030 100644 --- a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | using OpenMetaverse; | 28 | using OpenMetaverse; |
| 29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
| 30 | using System.Collections.Generic; | ||
| 30 | 31 | ||
| 31 | namespace OpenSim.Region.Framework.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
| 32 | { | 33 | { |
| @@ -45,5 +46,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 45 | /// </param> | 46 | /// </param> |
| 46 | /// <param name="offerMessage"></param> | 47 | /// <param name="offerMessage"></param> |
| 47 | void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage); | 48 | void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage); |
| 49 | List<FriendListItem> GetUserFriends(UUID agentID); | ||
| 48 | } | 50 | } |
| 49 | } | 51 | } |