From 1c6bf4fe774b5f04e9616dc46b11f54fdf6ab41e Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Thu, 26 Jun 2008 02:51:59 +0000 Subject: [PATCH] Mantis#1595. Thank you, Melanie for a patch that: Adds pipes for the prim item flags field --- OpenSim/Data/MSSQL/MSSQLDataStore.cs | 3 +++ OpenSim/Data/MySQL/MySQLDataStore.cs | 3 +++ OpenSim/Data/SQLite/SQLiteRegionData.cs | 3 +++ 3 files changed, 9 insertions(+) diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs index 6bf619acc8..b230d23754 100644 --- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs @@ -751,6 +751,7 @@ namespace OpenSim.Data.MSSQL createCol(items, "basePermissions", typeof(Int32)); createCol(items, "everyonePermissions", typeof(Int32)); createCol(items, "groupPermissions", typeof(Int32)); +// createCol(items, "flags", typeof(Int32)); items.PrimaryKey = new DataColumn[] { items.Columns["itemID"] }; @@ -885,6 +886,7 @@ namespace OpenSim.Data.MSSQL taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]); taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]); taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]); +// taskItem.Flags = Convert.ToUInt32(row["flags"]); return taskItem; } @@ -1054,6 +1056,7 @@ namespace OpenSim.Data.MSSQL row["basePermissions"] = taskItem.BaseMask; row["everyonePermissions"] = taskItem.EveryoneMask; row["groupPermissions"] = taskItem.GroupMask; +// row["flags"] = taskItem.Flags; } private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs index def875fac6..2b4702bf72 100644 --- a/OpenSim/Data/MySQL/MySQLDataStore.cs +++ b/OpenSim/Data/MySQL/MySQLDataStore.cs @@ -1010,6 +1010,7 @@ namespace OpenSim.Data.MySQL createCol(items, "basePermissions", typeof (Int32)); createCol(items, "everyonePermissions", typeof (Int32)); createCol(items, "groupPermissions", typeof (Int32)); + createCol(items, "flags", typeof (Int32)); items.PrimaryKey = new DataColumn[] {items.Columns["itemID"]}; @@ -1147,6 +1148,7 @@ namespace OpenSim.Data.MySQL taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]); taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]); taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]); + taskItem.Flags = Convert.ToUInt32(row["flags"]); return taskItem; } @@ -1338,6 +1340,7 @@ namespace OpenSim.Data.MySQL row["basePermissions"] = taskItem.BaseMask; row["everyonePermissions"] = taskItem.EveryoneMask; row["groupPermissions"] = taskItem.GroupMask; + row["flags"] = taskItem.Flags; } private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 8212691f8c..eb6f2538dd 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs @@ -749,6 +749,7 @@ namespace OpenSim.Data.SQLite createCol(items, "basePermissions", typeof (UInt32)); createCol(items, "everyonePermissions", typeof (UInt32)); createCol(items, "groupPermissions", typeof (UInt32)); + createCol(items, "flags", typeof (UInt32)); items.PrimaryKey = new DataColumn[] { items.Columns["itemID"] }; @@ -965,6 +966,7 @@ namespace OpenSim.Data.SQLite taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]); taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]); taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]); + taskItem.Flags = Convert.ToUInt32(row["flags"]); return taskItem; } @@ -1233,6 +1235,7 @@ namespace OpenSim.Data.SQLite row["basePermissions"] = taskItem.BaseMask; row["everyonePermissions"] = taskItem.EveryoneMask; row["groupPermissions"] = taskItem.GroupMask; + row["flags"] = taskItem.Flags; } private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID)