Mantis#1595. Thank you, Melanie for a patch that:
Adds pipes for the prim item flags field0.6.0-stable
parent
1cd6b71b60
commit
1c6bf4fe77
|
@ -751,6 +751,7 @@ namespace OpenSim.Data.MSSQL
|
||||||
createCol(items, "basePermissions", typeof(Int32));
|
createCol(items, "basePermissions", typeof(Int32));
|
||||||
createCol(items, "everyonePermissions", typeof(Int32));
|
createCol(items, "everyonePermissions", typeof(Int32));
|
||||||
createCol(items, "groupPermissions", typeof(Int32));
|
createCol(items, "groupPermissions", typeof(Int32));
|
||||||
|
// createCol(items, "flags", typeof(Int32));
|
||||||
|
|
||||||
items.PrimaryKey = new DataColumn[] { items.Columns["itemID"] };
|
items.PrimaryKey = new DataColumn[] { items.Columns["itemID"] };
|
||||||
|
|
||||||
|
@ -885,6 +886,7 @@ namespace OpenSim.Data.MSSQL
|
||||||
taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]);
|
taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]);
|
||||||
taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]);
|
taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]);
|
||||||
taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]);
|
taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]);
|
||||||
|
// taskItem.Flags = Convert.ToUInt32(row["flags"]);
|
||||||
|
|
||||||
return taskItem;
|
return taskItem;
|
||||||
}
|
}
|
||||||
|
@ -1054,6 +1056,7 @@ namespace OpenSim.Data.MSSQL
|
||||||
row["basePermissions"] = taskItem.BaseMask;
|
row["basePermissions"] = taskItem.BaseMask;
|
||||||
row["everyonePermissions"] = taskItem.EveryoneMask;
|
row["everyonePermissions"] = taskItem.EveryoneMask;
|
||||||
row["groupPermissions"] = taskItem.GroupMask;
|
row["groupPermissions"] = taskItem.GroupMask;
|
||||||
|
// row["flags"] = taskItem.Flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID)
|
private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID)
|
||||||
|
|
|
@ -1010,6 +1010,7 @@ namespace OpenSim.Data.MySQL
|
||||||
createCol(items, "basePermissions", typeof (Int32));
|
createCol(items, "basePermissions", typeof (Int32));
|
||||||
createCol(items, "everyonePermissions", typeof (Int32));
|
createCol(items, "everyonePermissions", typeof (Int32));
|
||||||
createCol(items, "groupPermissions", typeof (Int32));
|
createCol(items, "groupPermissions", typeof (Int32));
|
||||||
|
createCol(items, "flags", typeof (Int32));
|
||||||
|
|
||||||
items.PrimaryKey = new DataColumn[] {items.Columns["itemID"]};
|
items.PrimaryKey = new DataColumn[] {items.Columns["itemID"]};
|
||||||
|
|
||||||
|
@ -1147,6 +1148,7 @@ namespace OpenSim.Data.MySQL
|
||||||
taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]);
|
taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]);
|
||||||
taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]);
|
taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]);
|
||||||
taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]);
|
taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]);
|
||||||
|
taskItem.Flags = Convert.ToUInt32(row["flags"]);
|
||||||
|
|
||||||
return taskItem;
|
return taskItem;
|
||||||
}
|
}
|
||||||
|
@ -1338,6 +1340,7 @@ namespace OpenSim.Data.MySQL
|
||||||
row["basePermissions"] = taskItem.BaseMask;
|
row["basePermissions"] = taskItem.BaseMask;
|
||||||
row["everyonePermissions"] = taskItem.EveryoneMask;
|
row["everyonePermissions"] = taskItem.EveryoneMask;
|
||||||
row["groupPermissions"] = taskItem.GroupMask;
|
row["groupPermissions"] = taskItem.GroupMask;
|
||||||
|
row["flags"] = taskItem.Flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID)
|
private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID)
|
||||||
|
|
|
@ -749,6 +749,7 @@ namespace OpenSim.Data.SQLite
|
||||||
createCol(items, "basePermissions", typeof (UInt32));
|
createCol(items, "basePermissions", typeof (UInt32));
|
||||||
createCol(items, "everyonePermissions", typeof (UInt32));
|
createCol(items, "everyonePermissions", typeof (UInt32));
|
||||||
createCol(items, "groupPermissions", typeof (UInt32));
|
createCol(items, "groupPermissions", typeof (UInt32));
|
||||||
|
createCol(items, "flags", typeof (UInt32));
|
||||||
|
|
||||||
items.PrimaryKey = new DataColumn[] { items.Columns["itemID"] };
|
items.PrimaryKey = new DataColumn[] { items.Columns["itemID"] };
|
||||||
|
|
||||||
|
@ -965,6 +966,7 @@ namespace OpenSim.Data.SQLite
|
||||||
taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]);
|
taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]);
|
||||||
taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]);
|
taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]);
|
||||||
taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]);
|
taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]);
|
||||||
|
taskItem.Flags = Convert.ToUInt32(row["flags"]);
|
||||||
|
|
||||||
return taskItem;
|
return taskItem;
|
||||||
}
|
}
|
||||||
|
@ -1233,6 +1235,7 @@ namespace OpenSim.Data.SQLite
|
||||||
row["basePermissions"] = taskItem.BaseMask;
|
row["basePermissions"] = taskItem.BaseMask;
|
||||||
row["everyonePermissions"] = taskItem.EveryoneMask;
|
row["everyonePermissions"] = taskItem.EveryoneMask;
|
||||||
row["groupPermissions"] = taskItem.GroupMask;
|
row["groupPermissions"] = taskItem.GroupMask;
|
||||||
|
row["flags"] = taskItem.Flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID)
|
private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID)
|
||||||
|
|
Loading…
Reference in New Issue