From 4a9ca3ca8ff18f4fcf05c3983db5e6b1d49c97ee Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 21 Mar 2012 10:35:06 -0700
Subject: HG Friends: reroute the status notifications to the HGFriends
 service, so that they can scale better. They were previously being handled by
 the UAS; that is still there, but it's now obsolete and will be removed in a
 future release.

---
 .../CoreModules/Avatar/Friends/HGFriendsModule.cs  |  2 +-
 .../CoreModules/Avatar/Friends/HGStatusNotifier.cs | 31 +++++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index f50e52b..e50a84a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         IUserManagement m_uMan;
-        IUserManagement UserManagementModule
+        public IUserManagement UserManagementModule
         {
             get
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
index 62d54e4..61c6a30 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -10,10 +11,14 @@ using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;
 
 using OpenMetaverse;
 
+using log4net;
+
 namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
     public class HGStatusNotifier
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private HGFriendsModule m_FriendsModule;
 
         public HGStatusNotifier(HGFriendsModule friendsModule)
@@ -31,14 +36,28 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     List<string> ids = new List<string>();
                     foreach (FriendInfo f in kvp.Value)
                         ids.Add(f.Friend);
-                    UserAgentServiceConnector uConn = new UserAgentServiceConnector(kvp.Key);
-                    List<UUID> friendsOnline = uConn.StatusNotification(ids, userID, online);
 
-                    if (online && friendsOnline.Count > 0)
+                    if (ids.Count == 0)
+                        continue; // no one to notify. caller don't do this
+
+                    m_log.DebugFormat("[HG STATUS NOTIFIER]: Notifying {0} friends in {1}", ids.Count, kvp.Key);
+                    // ASSUMPTION: we assume that all users for one home domain
+                    // have exactly the same set of service URLs.
+                    // If this is ever not true, we need to change this.
+                    UUID friendID = UUID.Zero; String tmp = String.Empty;
+                    if (Util.ParseUniversalUserIdentifier(ids[0], out friendID, out tmp, out tmp, out tmp, out tmp))
                     {
-                        IClientAPI client = m_FriendsModule.LocateClientObject(userID);
-                        if (client != null)
-                            client.SendAgentOnline(friendsOnline.ToArray());
+                        string friendsServerURI = m_FriendsModule.UserManagementModule.GetUserServerURL(friendID, "FriendsServerURI");
+                        HGFriendsServicesConnector fConn = new HGFriendsServicesConnector(friendsServerURI);
+
+                        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());
+                        }
                     }
                 }
             }
-- 
cgit v1.1