Merge branch 'master' into careminster-presence-refactor

1 files changed, 21 insertions, 4 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
index 6f2d735..7422d94 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
@@ -78,6 +78,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public FriendInfo[] GetFriends(UUID principalID)
         {
+            return GetFriends(principalID.ToString());
+        }
+
+        public FriendInfo[] GetFriends(string principalID)
+        {
             if (String.IsNullOrEmpty(m_serverUrl))
                 return new FriendInfo[0];
 
@@ -95,7 +100,14 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     UUID friendID = friendEntry["Key"].AsUUID();
 
                     FriendInfo friend = new FriendInfo();
-                    friend.PrincipalID = principalID;
+                    if (!UUID.TryParse(principalID, out friend.PrincipalID))
+                    {
+                        string tmp = string.Empty;
+                        if (!Util.ParseUniversalUserIdentifier(principalID, out friend.PrincipalID, out tmp, out tmp, out tmp, out tmp))
+                            // bad record. ignore this entry
+                            continue;
+                    }
+
                     friend.Friend = friendID.ToString();
                     friend.MyFlags = friendEntry["Value"].AsInteger();
                     friend.TheirFlags = -1;
@@ -127,7 +139,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return array;
         }
 
-        public bool StoreFriend(UUID principalID, string friend, int flags)
+        public bool StoreFriend(string principalID, string friend, int flags)
         {
             if (String.IsNullOrEmpty(m_serverUrl))
                 return true;
@@ -152,6 +164,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public bool Delete(UUID principalID, string friend)
         {
+            return Delete(principalID.ToString(), friend);
+        }
+
+        public bool Delete(string principalID, string friend)
+        {
             if (String.IsNullOrEmpty(m_serverUrl))
                 return true;
 
@@ -174,7 +191,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         #endregion IFriendsService
 
-        private OSDArray GetFriended(UUID ownerID)
+        private OSDArray GetFriended(string ownerID)
         {
             NameValueCollection requestArgs = new NameValueCollection
             {
@@ -195,7 +212,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             }
         }
 
-        private OSDArray GetFriendedBy(UUID ownerID)
+        private OSDArray GetFriendedBy(string ownerID)
         {
             NameValueCollection requestArgs = new NameValueCollection
             {