diff options
| author | Justin Clark-Casey (justincc) | 2012-03-22 22:33:16 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-22 22:33:16 +0000 |
| commit | 3bcf71c64749c23a031c4d64ec8b57f512483441 (patch) | |
| tree | 143534083b688b6c114b159f27a31f091bda1007 /OpenSim | |
| parent | Add llGiveInventory() test from object to object where both objects are owned... (diff) | |
| parent | HG Friends: don't notify if the server isn't there. (diff) | |
| download | opensim-SC-3bcf71c64749c23a031c4d64ec8b57f512483441.zip opensim-SC-3bcf71c64749c23a031c4d64ec8b57f512483441.tar.gz opensim-SC-3bcf71c64749c23a031c4d64ec8b57f512483441.tar.bz2 opensim-SC-3bcf71c64749c23a031c4d64ec8b57f512483441.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs index 61c6a30..1fa4dd6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs | |||
| @@ -48,15 +48,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
| 48 | if (Util.ParseUniversalUserIdentifier(ids[0], out friendID, out tmp, out tmp, out tmp, out tmp)) | 48 | if (Util.ParseUniversalUserIdentifier(ids[0], out friendID, out tmp, out tmp, out tmp, out tmp)) |
| 49 | { | 49 | { |
| 50 | string friendsServerURI = m_FriendsModule.UserManagementModule.GetUserServerURL(friendID, "FriendsServerURI"); | 50 | string friendsServerURI = m_FriendsModule.UserManagementModule.GetUserServerURL(friendID, "FriendsServerURI"); |
| 51 | HGFriendsServicesConnector fConn = new HGFriendsServicesConnector(friendsServerURI); | 51 | if (friendsServerURI != string.Empty) |
| 52 | { | ||
| 53 | HGFriendsServicesConnector fConn = new HGFriendsServicesConnector(friendsServerURI); | ||
| 52 | 54 | ||
| 53 | List<UUID> friendsOnline = fConn.StatusNotification(ids, userID, online); | 55 | List<UUID> friendsOnline = fConn.StatusNotification(ids, userID, online); |
| 54 | 56 | ||
| 55 | if (online && friendsOnline.Count > 0) | 57 | if (online && friendsOnline.Count > 0) |
| 56 | { | 58 | { |
| 57 | IClientAPI client = m_FriendsModule.LocateClientObject(userID); | 59 | IClientAPI client = m_FriendsModule.LocateClientObject(userID); |
| 58 | if (client != null) | 60 | if (client != null) |
| 59 | client.SendAgentOnline(friendsOnline.ToArray()); | 61 | client.SendAgentOnline(friendsOnline.ToArray()); |
| 62 | } | ||
| 60 | } | 63 | } |
| 61 | } | 64 | } |
| 62 | } | 65 | } |