mirror of
https://github.com/opensim/opensim.git
synced 2026-08-08 18:25:33 +08:00
Merge branch 'master' into careminster-presence-refactor
This commit is contained in:
@@ -74,7 +74,9 @@ namespace OpenSim.Services.Interfaces
|
||||
public interface IFriendsService
|
||||
{
|
||||
FriendInfo[] GetFriends(UUID PrincipalID);
|
||||
bool StoreFriend(UUID PrincipalID, string Friend, int flags);
|
||||
FriendInfo[] GetFriends(string PrincipalID);
|
||||
bool StoreFriend(string PrincipalID, string Friend, int flags);
|
||||
bool Delete(UUID PrincipalID, string Friend);
|
||||
bool Delete(string PrincipalID, string Friend);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,9 +54,34 @@ namespace OpenSim.Services.Interfaces
|
||||
bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, out string reason);
|
||||
void LogoutAgent(UUID userID, UUID sessionID);
|
||||
GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt);
|
||||
Dictionary<string, object> GetServerURLs(UUID userID);
|
||||
|
||||
string LocateUser(UUID userID);
|
||||
// Tries to get the universal user identifier for the targetUserId
|
||||
// on behalf of the userID
|
||||
string GetUUI(UUID userID, UUID targetUserID);
|
||||
|
||||
// Returns the local friends online
|
||||
List<UUID> StatusNotification(List<string> friends, UUID userID, bool online);
|
||||
//List<UUID> GetOnlineFriends(UUID userID, List<string> friends);
|
||||
|
||||
bool AgentIsComingHome(UUID sessionID, string thisGridExternalName);
|
||||
bool VerifyAgent(UUID sessionID, string token);
|
||||
bool VerifyClient(UUID sessionID, string reportedIP);
|
||||
}
|
||||
|
||||
public interface IInstantMessage
|
||||
{
|
||||
bool IncomingInstantMessage(GridInstantMessage im);
|
||||
bool OutgoingInstantMessage(GridInstantMessage im, string url, bool foreigner);
|
||||
}
|
||||
public interface IFriendsSimConnector
|
||||
{
|
||||
bool StatusNotify(UUID userID, UUID friendID, bool online);
|
||||
}
|
||||
|
||||
public interface IInstantMessageSimConnector
|
||||
{
|
||||
bool SendInstantMessage(GridInstantMessage im);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user