HG Friends working to some extent: friendships offered and accepted correctly handled. Friends list showing correct foreign names. TODO: GrantRights.

1 files changed, 10 insertions, 3 deletions

diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
index 861c475..52b80e1 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
@@ -38,7 +38,7 @@ using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;
 using OpenSim.Server.Base;
 using OpenMetaverse;
 
-namespace OpenSim.Services.Connectors
+namespace OpenSim.Services.Connectors.Friends
 {
     public class FriendsServicesConnector : IFriendsService
     {
@@ -144,10 +144,17 @@ namespace OpenSim.Services.Connectors
 
         }
 
-        public bool StoreFriend(UUID PrincipalID, string Friend, int flags)
+        public bool StoreFriend(string PrincipalID, string Friend, int flags)
         {
             FriendInfo finfo = new FriendInfo();
-            finfo.PrincipalID = PrincipalID;
+            try
+            {
+                finfo.PrincipalID = new UUID(PrincipalID);
+            }
+            catch
+            {
+                return false;
+            }
             finfo.Friend = Friend;
             finfo.MyFlags = flags;