HG Friends bug fix: connector was shrinking principalID to UUID.

1 files changed, 12 insertions, 12 deletions

diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
index 08f1dc3..c5ae0c0 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
@@ -161,19 +161,8 @@ namespace OpenSim.Services.Connectors.Friends
 
         public bool StoreFriend(string PrincipalID, string Friend, int flags)
         {
-            FriendInfo finfo = new FriendInfo();
-            try
-            {
-                finfo.PrincipalID = new UUID(PrincipalID);
-            }
-            catch
-            {
-                return false;
-            }
-            finfo.Friend = Friend;
-            finfo.MyFlags = flags;
 
-            Dictionary<string, object> sendData = finfo.ToKeyValuePairs();
+            Dictionary<string, object> sendData = ToKeyValuePairs(PrincipalID, Friend, flags);
 
             sendData["METHOD"] = "storefriend";
 
@@ -267,5 +256,16 @@ namespace OpenSim.Services.Connectors.Friends
         }
 
         #endregion
+
+        public Dictionary<string, object> ToKeyValuePairs(string principalID, string friend, int flags)
+        {
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result["PrincipalID"] = principalID;
+            result["Friend"] = friend;
+            result["MyFlags"] = flags;
+
+            return result;
+        }
+
     }
 }
\ No newline at end of file