diff options
| author | Justin Clark-Casey (justincc) | 2012-03-21 23:59:59 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-22 00:00:05 +0000 |
| commit | 71ec84d77f440c9801462e1bda95a67f3386a19b (patch) | |
| tree | 5819185495a439ca2c5f7455bd377b32332e1254 /OpenSim/Services/Interfaces/IHypergridServices.cs | |
| parent | Instead of loading default avatar animations in both SLUtil and AvatarAnimati... (diff) | |
| parent | Updated the UserAccountsClient a little bit, plus some more sanity checks on ... (diff) | |
| download | opensim-SC_OLD-71ec84d77f440c9801462e1bda95a67f3386a19b.zip opensim-SC_OLD-71ec84d77f440c9801462e1bda95a67f3386a19b.tar.gz opensim-SC_OLD-71ec84d77f440c9801462e1bda95a67f3386a19b.tar.bz2 opensim-SC_OLD-71ec84d77f440c9801462e1bda95a67f3386a19b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Interfaces/IHypergridServices.cs')
| -rw-r--r-- | OpenSim/Services/Interfaces/IHypergridServices.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs index f48b8a9..3dc877a 100644 --- a/OpenSim/Services/Interfaces/IHypergridServices.cs +++ b/OpenSim/Services/Interfaces/IHypergridServices.cs | |||
| @@ -65,8 +65,8 @@ namespace OpenSim.Services.Interfaces | |||
| 65 | UUID GetUUID(String first, String last); | 65 | UUID GetUUID(String first, String last); |
| 66 | 66 | ||
| 67 | // Returns the local friends online | 67 | // Returns the local friends online |
| 68 | [Obsolete] | ||
| 68 | List<UUID> StatusNotification(List<string> friends, UUID userID, bool online); | 69 | List<UUID> StatusNotification(List<string> friends, UUID userID, bool online); |
| 69 | //List<UUID> GetOnlineFriends(UUID userID, List<string> friends); | ||
| 70 | 70 | ||
| 71 | bool IsAgentComingHome(UUID sessionID, string thisGridExternalName); | 71 | bool IsAgentComingHome(UUID sessionID, string thisGridExternalName); |
| 72 | bool VerifyAgent(UUID sessionID, string token); | 72 | bool VerifyAgent(UUID sessionID, string token); |
| @@ -92,6 +92,8 @@ namespace OpenSim.Services.Interfaces | |||
| 92 | bool DeleteFriendship(FriendInfo finfo, string secret); | 92 | bool DeleteFriendship(FriendInfo finfo, string secret); |
| 93 | bool FriendshipOffered(UUID from, string fromName, UUID to, string message); | 93 | bool FriendshipOffered(UUID from, string fromName, UUID to, string message); |
| 94 | bool ValidateFriendshipOffered(UUID fromID, UUID toID); | 94 | bool ValidateFriendshipOffered(UUID fromID, UUID toID); |
| 95 | // Returns the local friends online | ||
| 96 | List<UUID> StatusNotification(List<string> friends, UUID userID, bool online); | ||
| 95 | } | 97 | } |
| 96 | 98 | ||
| 97 | public interface IInstantMessageSimConnector | 99 | public interface IInstantMessageSimConnector |