mirror of
https://github.com/opensim/opensim.git
synced 2026-08-01 22:26:09 +08:00
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
This commit is contained in:
@@ -38,19 +38,26 @@ namespace OpenSim.Data.MySQL
|
||||
public class MySqlFriendsData : MySQLGenericTableHandler<FriendsData>, IFriendsData
|
||||
{
|
||||
public MySqlFriendsData(string connectionString, string realm)
|
||||
: base(connectionString, realm, "Friends")
|
||||
: base(connectionString, realm, "FriendsStore")
|
||||
{
|
||||
}
|
||||
|
||||
public bool Delete(UUID principalID, UUID friendID)
|
||||
public bool Delete(UUID principalID, string friend)
|
||||
{
|
||||
// We need to delete the row where PrincipalID=principalID AND FriendID=firnedID
|
||||
return false;
|
||||
MySqlCommand cmd = new MySqlCommand();
|
||||
|
||||
cmd.CommandText = String.Format("delete from {0} where PrincipalID = ?PrincipalID and Friend = ?Friend", m_Realm);
|
||||
cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
|
||||
cmd.Parameters.AddWithValue("?Friend", friend);
|
||||
|
||||
ExecuteNonQuery(cmd);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public FriendsData[] GetFriends(UUID userID)
|
||||
public FriendsData[] GetFriends(UUID principalID)
|
||||
{
|
||||
return Get("PrincipalID =\'" + userID.ToString() + "'");
|
||||
return Get("PrincipalID", principalID.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
5
OpenSim/Data/MySQL/Resources/001_FriendsStore.sql
Normal file
5
OpenSim/Data/MySQL/Resources/001_FriendsStore.sql
Normal file
@@ -0,0 +1,5 @@
|
||||
BEGIN;
|
||||
|
||||
CREATE TABLE `Friends` (`PrincipalID` CHAR(36) NOT NULL, `Friend` VARCHAR(255) NOT NULL, `Flags` VARCHAR(16) NOT NULL DEFAULT 0, `Offered` VARCHAR(32) NOT NULL DEFAULT 0, PRIMARY KEY(`PrincipalID`, `Friend`), KEY(`PrincipalID`));
|
||||
|
||||
COMMIT;
|
||||
5
OpenSim/Data/MySQL/Resources/002_FriendsStore.sql
Normal file
5
OpenSim/Data/MySQL/Resources/002_FriendsStore.sql
Normal file
@@ -0,0 +1,5 @@
|
||||
BEGIN;
|
||||
|
||||
INSERT INTO `Friends` SELECT `ownerID`, `friendID`, `friendPerms`, 0 FROM `userfriends`;
|
||||
|
||||
COMMIT;
|
||||
Reference in New Issue
Block a user