aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-14 19:36:29 +0000
committerMelanie Thielker2008-11-14 19:36:29 +0000
commit5214d39e7ce0de3edc14d0a20c9652f0056ab045 (patch)
treecdc2972ad12b7618726f09a22ebb7a76ed264785 /OpenSim/Data
parentAdd SQLite and the missing migrations files for last commit (diff)
downloadopensim-SC_OLD-5214d39e7ce0de3edc14d0a20c9652f0056ab045.zip
opensim-SC_OLD-5214d39e7ce0de3edc14d0a20c9652f0056ab045.tar.gz
opensim-SC_OLD-5214d39e7ce0de3edc14d0a20c9652f0056ab045.tar.bz2
opensim-SC_OLD-5214d39e7ce0de3edc14d0a20c9652f0056ab045.tar.xz
Mantis #2618
Thank you, StrawberryFride, for a patch that adds group permission support to MSSQL. Contains a migration, back up your database.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLInventoryData.cs6
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs1
-rw-r--r--OpenSim/Data/MSSQL/Resources/002_InventoryStore.sql5
3 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 79bab3b..eb31cc8 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -488,11 +488,11 @@ namespace OpenSim.Data.MSSQL
488 string sql = "INSERT INTO inventoryitems"; 488 string sql = "INSERT INTO inventoryitems";
489 sql += "([inventoryID], [assetID], [assetType], [parentFolderID], [avatarID], [inventoryName]" 489 sql += "([inventoryID], [assetID], [assetType], [parentFolderID], [avatarID], [inventoryName]"
490 + ", [inventoryDescription], [inventoryNextPermissions], [inventoryCurrentPermissions]" 490 + ", [inventoryDescription], [inventoryNextPermissions], [inventoryCurrentPermissions]"
491 + ", [invType], [creatorID], [inventoryBasePermissions], [inventoryEveryOnePermissions]" 491 + ", [invType], [creatorID], [inventoryBasePermissions], [inventoryEveryOnePermissions], [inventoryGroupPermissions]"
492 + ", [salePrice], [saleType], [creationDate], [groupID], [groupOwned], [flags]) VALUES "; 492 + ", [salePrice], [saleType], [creationDate], [groupID], [groupOwned], [flags]) VALUES ";
493 sql += "(@inventoryID, @assetID, @assetType, @parentFolderID, @avatarID, @inventoryName, @inventoryDescription" 493 sql += "(@inventoryID, @assetID, @assetType, @parentFolderID, @avatarID, @inventoryName, @inventoryDescription"
494 + ", @inventoryNextPermissions, @inventoryCurrentPermissions, @invType, @creatorID" 494 + ", @inventoryNextPermissions, @inventoryCurrentPermissions, @invType, @creatorID"
495 + ", @inventoryBasePermissions, @inventoryEveryOnePermissions, @salePrice, @saleType" 495 + ", @inventoryBasePermissions, @inventoryEveryOnePermissions, @inventoryGroupPermissions, @salePrice, @saleType"
496 + ", @creationDate, @groupID, @groupOwned, @flags);"; 496 + ", @creationDate, @groupID, @groupOwned, @flags);";
497 497
498 using (AutoClosingSqlCommand command = database.Query(sql)) 498 using (AutoClosingSqlCommand command = database.Query(sql))
@@ -510,6 +510,7 @@ namespace OpenSim.Data.MSSQL
510 command.Parameters.Add(database.CreateParameter("creatorID", item.Creator)); 510 command.Parameters.Add(database.CreateParameter("creatorID", item.Creator));
511 command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions)); 511 command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions));
512 command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions)); 512 command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions));
513 command.Parameters.Add(database.CreateParameter("inventoryGroupPermissions", item.GroupPermissions));
513 command.Parameters.Add(database.CreateParameter("salePrice", item.SalePrice)); 514 command.Parameters.Add(database.CreateParameter("salePrice", item.SalePrice));
514 command.Parameters.Add(database.CreateParameter("saleType", item.SaleType)); 515 command.Parameters.Add(database.CreateParameter("saleType", item.SaleType));
515 command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate)); 516 command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate));
@@ -786,6 +787,7 @@ namespace OpenSim.Data.MSSQL
786 item.Creator = new UUID(reader["creatorID"].ToString()); 787 item.Creator = new UUID(reader["creatorID"].ToString());
787 item.BasePermissions = Convert.ToUInt32(reader["inventoryBasePermissions"]); 788 item.BasePermissions = Convert.ToUInt32(reader["inventoryBasePermissions"]);
788 item.EveryOnePermissions = Convert.ToUInt32(reader["inventoryEveryOnePermissions"]); 789 item.EveryOnePermissions = Convert.ToUInt32(reader["inventoryEveryOnePermissions"]);
790 item.GroupPermissions = Convert.ToUInt32(reader["inventoryGroupPermissions"]);
789 item.SalePrice = Convert.ToInt32(reader["salePrice"]); 791 item.SalePrice = Convert.ToInt32(reader["salePrice"]);
790 item.SaleType = Convert.ToByte(reader["saleType"]); 792 item.SaleType = Convert.ToByte(reader["saleType"]);
791 item.CreationDate = Convert.ToInt32(reader["creationDate"]); 793 item.CreationDate = Convert.ToInt32(reader["creationDate"]);
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index dc7b6e4..22b3c94 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -679,6 +679,7 @@ namespace OpenSim.Data.MSSQL
679 /// <param name="appearance">the appearence</param> 679 /// <param name="appearance">the appearence</param>
680 override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance) 680 override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
681 { 681 {
682 m_log.Error("[USER DB] updating user appearance for user ID " + user.Guid.ToString());
682 string sql = String.Empty; 683 string sql = String.Empty;
683 sql += "DELETE FROM avatarappearance WHERE owner=@owner "; 684 sql += "DELETE FROM avatarappearance WHERE owner=@owner ";
684 sql += "INSERT INTO avatarappearance "; 685 sql += "INSERT INTO avatarappearance ";
diff --git a/OpenSim/Data/MSSQL/Resources/002_InventoryStore.sql b/OpenSim/Data/MSSQL/Resources/002_InventoryStore.sql
new file mode 100644
index 0000000..bcc26b8
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/002_InventoryStore.sql
@@ -0,0 +1,5 @@
1BEGIN TRANSACTION
2
3ALTER TABLE inventoryitems ADD inventoryGroupPermissions INTEGER NOT NULL default 0
4
5COMMIT \ No newline at end of file