From 336665e03532cf9d7a1ad65d5071e7050bf6ecd0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 22 May 2011 16:51:03 -0700
Subject: More on HG Friends. Added Delete(string, string) across the board.
 Added security to friendship identifiers so that they can safely be deleted
 across worlds. Had to change Get(string) to use LIKE because the secret in
 the identifier is not always known -- affects only HG visitors. BOTTOM LINE
 SO FAR: HG friendships established and deleted safely across grids, local
 rights working but not (yet?) being transmitted back.

---
 .../Connectors/SimianGrid/SimianFriendsServiceConnector.cs         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services/Connectors/SimianGrid')

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
index b1c34dd..7422d94 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     if (!UUID.TryParse(principalID, out friend.PrincipalID))
                     {
                         string tmp = string.Empty;
-                        if (!Util.ParseUniversalUserIdentifier(principalID, out friend.PrincipalID, out tmp, out tmp, out tmp))
+                        if (!Util.ParseUniversalUserIdentifier(principalID, out friend.PrincipalID, out tmp, out tmp, out tmp, out tmp))
                             // bad record. ignore this entry
                             continue;
                     }
@@ -164,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;
 
-- 
cgit v1.1