* Deal with a situation where the new fields in the inventory store are null on sqlite
* This is due to a preparatory change I made yesterday0.6.0-stable
parent
f3b44deeee
commit
eac3fd51f0
|
@ -103,12 +103,24 @@ namespace OpenSim.Data.SQLite
|
||||||
item.EveryOnePermissions = Convert.ToUInt32(row["inventoryEveryOnePermissions"]);
|
item.EveryOnePermissions = Convert.ToUInt32(row["inventoryEveryOnePermissions"]);
|
||||||
|
|
||||||
// new fields
|
// new fields
|
||||||
item.SalePrice = Convert.ToInt32(row["salePrice"]);
|
if (!Convert.IsDBNull(row["salePrice"]))
|
||||||
item.SaleType = Convert.ToByte(row["saleType"]);
|
item.SalePrice = Convert.ToInt32(row["salePrice"]);
|
||||||
item.CreationDate = Convert.ToInt32(row["creationDate"]);
|
|
||||||
item.GroupID = new LLUUID((string)row["groupID"]);
|
if (!Convert.IsDBNull(row["saleType"]))
|
||||||
item.GroupOwned = Convert.ToBoolean(row["groupOwned"]);
|
item.SaleType = Convert.ToByte(row["saleType"]);
|
||||||
item.Flags = Convert.ToUInt32(row["Flags"]);
|
|
||||||
|
if (!Convert.IsDBNull(row["creationDate"]))
|
||||||
|
item.CreationDate = Convert.ToInt32(row["creationDate"]);
|
||||||
|
|
||||||
|
if (!Convert.IsDBNull(row["groupID"]))
|
||||||
|
item.GroupID = new LLUUID((string)row["groupID"]);
|
||||||
|
|
||||||
|
if (!Convert.IsDBNull(row["groupOwned"]))
|
||||||
|
item.GroupOwned = Convert.ToBoolean(row["groupOwned"]);
|
||||||
|
|
||||||
|
if (!Convert.IsDBNull(row["Flags"]))
|
||||||
|
item.Flags = Convert.ToUInt32(row["Flags"]);
|
||||||
|
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue