aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-22 22:33:16 +0000
committerJustin Clark-Casey (justincc)2012-03-22 22:33:16 +0000
commit3bcf71c64749c23a031c4d64ec8b57f512483441 (patch)
tree143534083b688b6c114b159f27a31f091bda1007 /OpenSim/Region/CoreModules
parentAdd llGiveInventory() test from object to object where both objects are owned... (diff)
parentHG Friends: don't notify if the server isn't there. (diff)
downloadopensim-SC_OLD-3bcf71c64749c23a031c4d64ec8b57f512483441.zip
opensim-SC_OLD-3bcf71c64749c23a031c4d64ec8b57f512483441.tar.gz
opensim-SC_OLD-3bcf71c64749c23a031c4d64ec8b57f512483441.tar.bz2
opensim-SC_OLD-3bcf71c64749c23a031c4d64ec8b57f512483441.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs17
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 }