Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
3bcf71c647
|
@ -48,15 +48,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
|
||||||
if (Util.ParseUniversalUserIdentifier(ids[0], out friendID, out tmp, out tmp, out tmp, out tmp))
|
if (Util.ParseUniversalUserIdentifier(ids[0], out friendID, out tmp, out tmp, out tmp, out tmp))
|
||||||
{
|
{
|
||||||
string friendsServerURI = m_FriendsModule.UserManagementModule.GetUserServerURL(friendID, "FriendsServerURI");
|
string friendsServerURI = m_FriendsModule.UserManagementModule.GetUserServerURL(friendID, "FriendsServerURI");
|
||||||
HGFriendsServicesConnector fConn = new HGFriendsServicesConnector(friendsServerURI);
|
if (friendsServerURI != string.Empty)
|
||||||
|
|
||||||
List<UUID> friendsOnline = fConn.StatusNotification(ids, userID, online);
|
|
||||||
|
|
||||||
if (online && friendsOnline.Count > 0)
|
|
||||||
{
|
{
|
||||||
IClientAPI client = m_FriendsModule.LocateClientObject(userID);
|
HGFriendsServicesConnector fConn = new HGFriendsServicesConnector(friendsServerURI);
|
||||||
if (client != null)
|
|
||||||
client.SendAgentOnline(friendsOnline.ToArray());
|
List<UUID> friendsOnline = fConn.StatusNotification(ids, userID, online);
|
||||||
|
|
||||||
|
if (online && friendsOnline.Count > 0)
|
||||||
|
{
|
||||||
|
IClientAPI client = m_FriendsModule.LocateClientObject(userID);
|
||||||
|
if (client != null)
|
||||||
|
client.SendAgentOnline(friendsOnline.ToArray());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue