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/SQLite/SQLiteFriendsData.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Data/SQLite')

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


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.

---
 OpenSim/Data/SQLite/SQLiteFriendsData.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Data/SQLite')

diff --git a/OpenSim/Data/SQLite/SQLiteFriendsData.cs b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
index d925412..b14c348 100644
--- a/OpenSim/Data/SQLite/SQLiteFriendsData.cs
+++ b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
@@ -64,6 +64,11 @@ namespace OpenSim.Data.SQLite
 
         public bool Delete(UUID principalID, string friend)
         {
+            return Delete(principalID.ToString(), friend);
+        }
+
+        public bool Delete(string principalID, string friend)
+        {
             SqliteCommand cmd = new SqliteCommand();
 
             cmd.CommandText = String.Format("delete from {0} where PrincipalID = :PrincipalID and Friend = :Friend", m_Realm);
-- 
cgit v1.1


From 28cd03cda5c4beae2befeaef116b54dbd344c636 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 May 2011 22:54:03 +0100
Subject: fix bug where generic sqlite table delete wasn't working.

this would have caused dupe links bugs when using the sqlite adaptor
---
 OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Data/SQLite')

diff --git a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
index 3fb2d3f..0d7ae1f 100644
--- a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
+++ b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
@@ -280,7 +280,7 @@ namespace OpenSim.Data.SQLite
 
             string where = String.Join(" and ", terms.ToArray());
 
-            string query = String.Format("delete * from {0} where {1}", m_Realm, where);
+            string query = String.Format("delete from {0} where {1}", m_Realm, where);
 
             cmd.CommandText = query;
 
-- 
cgit v1.1