aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-06-26 02:51:59 +0000
committerCharles Krinke2008-06-26 02:51:59 +0000
commit1c6bf4fe774b5f04e9616dc46b11f54fdf6ab41e (patch)
tree29d39db66106c6f7e01d96576331e7c109b480fc
parentMantis#1594. Thank you, Melanie for a patch that: (diff)
downloadopensim-SC-1c6bf4fe774b5f04e9616dc46b11f54fdf6ab41e.zip
opensim-SC-1c6bf4fe774b5f04e9616dc46b11f54fdf6ab41e.tar.gz
opensim-SC-1c6bf4fe774b5f04e9616dc46b11f54fdf6ab41e.tar.bz2
opensim-SC-1c6bf4fe774b5f04e9616dc46b11f54fdf6ab41e.tar.xz
Mantis#1595. Thank you, Melanie for a patch that:
Adds pipes for the prim item flags field
-rw-r--r--OpenSim/Data/MSSQL/MSSQLDataStore.cs3
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs3
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs3
3 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
index 6bf619a..b230d23 100644
--- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
@@ -751,6 +751,7 @@ namespace OpenSim.Data.MSSQL
751 createCol(items, "basePermissions", typeof(Int32)); 751 createCol(items, "basePermissions", typeof(Int32));
752 createCol(items, "everyonePermissions", typeof(Int32)); 752 createCol(items, "everyonePermissions", typeof(Int32));
753 createCol(items, "groupPermissions", typeof(Int32)); 753 createCol(items, "groupPermissions", typeof(Int32));
754// createCol(items, "flags", typeof(Int32));
754 755
755 items.PrimaryKey = new DataColumn[] { items.Columns["itemID"] }; 756 items.PrimaryKey = new DataColumn[] { items.Columns["itemID"] };
756 757
@@ -885,6 +886,7 @@ namespace OpenSim.Data.MSSQL
885 taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]); 886 taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]);
886 taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]); 887 taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]);
887 taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]); 888 taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]);
889// taskItem.Flags = Convert.ToUInt32(row["flags"]);
888 890
889 return taskItem; 891 return taskItem;
890 } 892 }
@@ -1054,6 +1056,7 @@ namespace OpenSim.Data.MSSQL
1054 row["basePermissions"] = taskItem.BaseMask; 1056 row["basePermissions"] = taskItem.BaseMask;
1055 row["everyonePermissions"] = taskItem.EveryoneMask; 1057 row["everyonePermissions"] = taskItem.EveryoneMask;
1056 row["groupPermissions"] = taskItem.GroupMask; 1058 row["groupPermissions"] = taskItem.GroupMask;
1059// row["flags"] = taskItem.Flags;
1057 } 1060 }
1058 1061
1059 private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) 1062 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 def875f..2b4702b 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -1010,6 +1010,7 @@ namespace OpenSim.Data.MySQL
1010 createCol(items, "basePermissions", typeof (Int32)); 1010 createCol(items, "basePermissions", typeof (Int32));
1011 createCol(items, "everyonePermissions", typeof (Int32)); 1011 createCol(items, "everyonePermissions", typeof (Int32));
1012 createCol(items, "groupPermissions", typeof (Int32)); 1012 createCol(items, "groupPermissions", typeof (Int32));
1013 createCol(items, "flags", typeof (Int32));
1013 1014
1014 items.PrimaryKey = new DataColumn[] {items.Columns["itemID"]}; 1015 items.PrimaryKey = new DataColumn[] {items.Columns["itemID"]};
1015 1016
@@ -1147,6 +1148,7 @@ namespace OpenSim.Data.MySQL
1147 taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]); 1148 taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]);
1148 taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]); 1149 taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]);
1149 taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]); 1150 taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]);
1151 taskItem.Flags = Convert.ToUInt32(row["flags"]);
1150 1152
1151 return taskItem; 1153 return taskItem;
1152 } 1154 }
@@ -1338,6 +1340,7 @@ namespace OpenSim.Data.MySQL
1338 row["basePermissions"] = taskItem.BaseMask; 1340 row["basePermissions"] = taskItem.BaseMask;
1339 row["everyonePermissions"] = taskItem.EveryoneMask; 1341 row["everyonePermissions"] = taskItem.EveryoneMask;
1340 row["groupPermissions"] = taskItem.GroupMask; 1342 row["groupPermissions"] = taskItem.GroupMask;
1343 row["flags"] = taskItem.Flags;
1341 } 1344 }
1342 1345
1343 private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) 1346 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 8212691..eb6f253 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -749,6 +749,7 @@ namespace OpenSim.Data.SQLite
749 createCol(items, "basePermissions", typeof (UInt32)); 749 createCol(items, "basePermissions", typeof (UInt32));
750 createCol(items, "everyonePermissions", typeof (UInt32)); 750 createCol(items, "everyonePermissions", typeof (UInt32));
751 createCol(items, "groupPermissions", typeof (UInt32)); 751 createCol(items, "groupPermissions", typeof (UInt32));
752 createCol(items, "flags", typeof (UInt32));
752 753
753 items.PrimaryKey = new DataColumn[] { items.Columns["itemID"] }; 754 items.PrimaryKey = new DataColumn[] { items.Columns["itemID"] };
754 755
@@ -965,6 +966,7 @@ namespace OpenSim.Data.SQLite
965 taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]); 966 taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]);
966 taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]); 967 taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]);
967 taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]); 968 taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]);
969 taskItem.Flags = Convert.ToUInt32(row["flags"]);
968 970
969 return taskItem; 971 return taskItem;
970 } 972 }
@@ -1233,6 +1235,7 @@ namespace OpenSim.Data.SQLite
1233 row["basePermissions"] = taskItem.BaseMask; 1235 row["basePermissions"] = taskItem.BaseMask;
1234 row["everyonePermissions"] = taskItem.EveryoneMask; 1236 row["everyonePermissions"] = taskItem.EveryoneMask;
1235 row["groupPermissions"] = taskItem.GroupMask; 1237 row["groupPermissions"] = taskItem.GroupMask;
1238 row["flags"] = taskItem.Flags;
1236 } 1239 }
1237 1240
1238 private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) 1241 private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID)