From 58c53c41de2cae0bb041a2e8121792e136d1edb2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 21 May 2011 16:48:00 -0700
Subject: Fixed permissions bug related to friends in PermissionsModule. Added
 FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[]
 GetFriends(string PrincipalID) to IFriendsService. Refactored some more in
 the FriendsModule. Made client get notification of local friends permissions
 upon HGLogin. HG Friends object permissions work.

---
 OpenSim/Data/IFriendsData.cs             | 1 +
 OpenSim/Data/MSSQL/MSSQLFriendsData.cs   | 6 ++++++
 OpenSim/Data/MySQL/MySQLFriendsData.cs   | 5 +++++
 OpenSim/Data/Null/NullFriendsData.cs     | 7 ++++++-
 OpenSim/Data/SQLite/SQLiteFriendsData.cs | 7 ++++++-
 5 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Data')

diff --git a/OpenSim/Data/IFriendsData.cs b/OpenSim/Data/IFriendsData.cs
index 4da567e..52e7f14 100644
--- a/OpenSim/Data/IFriendsData.cs
+++ b/OpenSim/Data/IFriendsData.cs
@@ -47,5 +47,6 @@ namespace OpenSim.Data
         bool Store(FriendsData data);
         bool Delete(UUID ownerID, string friend);
         FriendsData[] GetFriends(UUID principalID);
+        FriendsData[] GetFriends(string principalID);
     }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
index af4fd9b..ba1b085 100644
--- a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
@@ -68,6 +68,11 @@ namespace OpenSim.Data.MSSQL
 
         public FriendsData[] GetFriends(UUID principalID)
         {
+            return GetFriends(principalID.ToString());
+        }
+
+        public FriendsData[] GetFriends(string principalID)
+        {
             using (SqlConnection conn = new SqlConnection(m_ConnectionString))
             using (SqlCommand cmd = new SqlCommand())
             {
@@ -79,5 +84,6 @@ namespace OpenSim.Data.MSSQL
                 return DoQuery(cmd);
             }
         }
+
     }
 }
diff --git a/OpenSim/Data/MySQL/MySQLFriendsData.cs b/OpenSim/Data/MySQL/MySQLFriendsData.cs
index 663fad6..69fac9d 100644
--- a/OpenSim/Data/MySQL/MySQLFriendsData.cs
+++ b/OpenSim/Data/MySQL/MySQLFriendsData.cs
@@ -57,6 +57,11 @@ namespace OpenSim.Data.MySQL
 
         public FriendsData[] GetFriends(UUID principalID)
         {
+            return GetFriends(principalID.ToString());
+        }
+
+        public FriendsData[] GetFriends(string principalID)
+        {
             MySqlCommand cmd = new MySqlCommand();
 
             cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = ?PrincipalID", m_Realm);
diff --git a/OpenSim/Data/Null/NullFriendsData.cs b/OpenSim/Data/Null/NullFriendsData.cs
index 0c69bb1..2bfdc7a 100644
--- a/OpenSim/Data/Null/NullFriendsData.cs
+++ b/OpenSim/Data/Null/NullFriendsData.cs
@@ -42,6 +42,11 @@ namespace OpenSim.Data.Null
         {
         }
 
+        public FriendsData[] GetFriends(UUID principalID)
+        {
+            return GetFriends(principalID.ToString());
+        }
+
         /// <summary>
         /// Tries to implement the Get [] semantics, but it cuts corners.
         /// Specifically, it gets all friendships even if they weren't accepted yet.
@@ -49,7 +54,7 @@ namespace OpenSim.Data.Null
         /// <param name="fields"></param>
         /// <param name="values"></param>
         /// <returns></returns>
-        public FriendsData[] GetFriends(UUID userID)
+        public FriendsData[] GetFriends(string userID)
         {
             List<FriendsData> lst = m_Data.FindAll(delegate (FriendsData fdata)
             {
diff --git a/OpenSim/Data/SQLite/SQLiteFriendsData.cs b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
index 4bfd228..d925412 100644
--- a/OpenSim/Data/SQLite/SQLiteFriendsData.cs
+++ b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
@@ -46,7 +46,12 @@ namespace OpenSim.Data.SQLite
         {
         }
 
-        public FriendsData[] GetFriends(UUID userID)
+        public FriendsData[] GetFriends(UUID principalID)
+        {
+            return GetFriends(principalID.ToString());
+        }
+
+        public FriendsData[] GetFriends(string userID)
         {
             SqliteCommand cmd = new SqliteCommand();
 
-- 
cgit v1.1