From d1256536b500a0d72eb643635d10c65980ea2588 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 17 Mar 2012 21:27:28 -0700
Subject: Added GetUUID(first, last) on UserAgentsService so that we can
 finally make direct user connections.

---
 OpenSim/Services/HypergridService/UserAgentService.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')

diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index f681df4..5eca801 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -566,6 +566,16 @@ namespace OpenSim.Services.HypergridService
 
             return string.Empty;
         }
+
+        public UUID GetUUID(String first, String last)
+        {
+                        // Let's see if it's a local user
+            UserAccount account = m_UserAccountService.GetUserAccount(UUID.Zero, first, last);
+            if (account != null)
+                return account.PrincipalID;
+            else
+                return UUID.Zero;
+        }
     }
 
     class TravelingAgentInfo
-- 
cgit v1.1


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.

---
 OpenSim/Services/HypergridService/UserAgentService.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')

diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 5eca801..6a5007f 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -334,6 +334,7 @@ namespace OpenSim.Services.HypergridService
             return false;
         }
 
+        [Obsolete]
         public List<UUID> StatusNotification(List<string> friends, UUID foreignUserID, bool online)
         {
             if (m_FriendsService == null || m_PresenceService == null)
@@ -414,6 +415,7 @@ namespace OpenSim.Services.HypergridService
                 return new List<UUID>();
         }
 
+        [Obsolete]
         protected void ForwardStatusNotificationToSim(UUID regionID, UUID foreignUserID, string user, bool online)
         {
             UUID userID;
-- 
cgit v1.1