ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'arthur/master'

Browse Source
This commit is contained in:
Sean Dague
2008-10-14 19:00:43 +00:00
parent 58f8c042f6
commit a27352010a
3 changed files with 260 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Data/SQLite/SQLiteUserData.cs
View File

@@ -117,6 +117,13 @@ namespace OpenSim.Data.SQLite
setupUserFriendsCommands(daf, conn);
daf.Fill(ds.Tables["userfriends"]);
string Unique = "create unique index friend_unique on userfriends (ownerID,friendID)";
using (SqliteCommand cmd = new SqliteCommand(Unique, g_conn))
{
cmd.ExecuteNonQuery();
}
}
return;
@@ -210,8 +217,7 @@ namespace OpenSim.Data.SQLite
/// <param name="perms">permission flag</param>
override public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
{
string InsertFriends = "insert into userfriends(ownerID, friendID, friendPerms) values(:ownerID, :friendID, :perms)";
string InsertFriends = "insert or ignore into userfriends(ownerID, friendID, friendPerms) values(:ownerID, :friendID, :perms)";
using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn))
{
cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
@@ -235,7 +241,7 @@ namespace OpenSim.Data.SQLite
/// <param name="friend">UUID of the friend to remove</param>
override public void RemoveUserFriend(UUID friendlistowner, UUID friend)
{
string DeletePerms = "delete from friendlist where (ownerID=:ownerID and friendID=:friendID) or (ownerID=:friendID and friendID=:ownerID)";
string DeletePerms = "delete from userfriends where (ownerID=:ownerID and friendID=:friendID) or (ownerID=:friendID and friendID=:ownerID)";
using (SqliteCommand cmd = new SqliteCommand(DeletePerms, g_conn))
{
cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
@@ -252,7 +258,7 @@ namespace OpenSim.Data.SQLite
/// <param name="perms">updated permission flag</param>
override public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
{
string UpdatePerms = "update friendlist set perms=:perms where ownerID=:ownerID and friendID=:friendID";
string UpdatePerms = "update userfriends set friendPerms=:perms where ownerID=:ownerID and friendID=:friendID";
using (SqliteCommand cmd = new SqliteCommand(UpdatePerms, g_conn))
{
cmd.Parameters.Add(new SqliteParameter(":perms", perms));