diff options
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 32 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 2 |
2 files changed, 32 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs index 5c53f32..b638528 100644 --- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs | |||
@@ -101,6 +101,14 @@ namespace OpenSim.Data.SQLite | |||
101 | item.CurrentPermissions = Convert.ToUInt32(row["inventoryCurrentPermissions"]); | 101 | item.CurrentPermissions = Convert.ToUInt32(row["inventoryCurrentPermissions"]); |
102 | item.BasePermissions = Convert.ToUInt32(row["inventoryBasePermissions"]); | 102 | item.BasePermissions = Convert.ToUInt32(row["inventoryBasePermissions"]); |
103 | item.EveryOnePermissions = Convert.ToUInt32(row["inventoryEveryOnePermissions"]); | 103 | item.EveryOnePermissions = Convert.ToUInt32(row["inventoryEveryOnePermissions"]); |
104 | |||
105 | // new fields | ||
106 | item.SalePrice = Convert.ToInt32(row["salePrice"]); | ||
107 | item.SaleType = Convert.ToByte(row["saleType"]); | ||
108 | item.CreationDate = Convert.ToInt32(row["creationDate"]); | ||
109 | item.GroupID = new LLUUID((string)row["groupID"]); | ||
110 | item.GroupOwned = Convert.ToBoolean(row["groupOwned"]); | ||
111 | item.Flags = Convert.ToUInt32(row["Flags"]); | ||
104 | return item; | 112 | return item; |
105 | } | 113 | } |
106 | 114 | ||
@@ -120,6 +128,14 @@ namespace OpenSim.Data.SQLite | |||
120 | row["inventoryCurrentPermissions"] = item.CurrentPermissions; | 128 | row["inventoryCurrentPermissions"] = item.CurrentPermissions; |
121 | row["inventoryBasePermissions"] = item.BasePermissions; | 129 | row["inventoryBasePermissions"] = item.BasePermissions; |
122 | row["inventoryEveryOnePermissions"] = item.EveryOnePermissions; | 130 | row["inventoryEveryOnePermissions"] = item.EveryOnePermissions; |
131 | |||
132 | // new fields | ||
133 | row["salePrice"] = item.SalePrice; | ||
134 | row["saleType"] = item.SaleType; | ||
135 | row["creationDate"] = item.CreationDate; | ||
136 | row["groupID"] = item.GroupID; | ||
137 | row["groupOwned"] = item.GroupOwned; | ||
138 | row["flags"] = item.Flags; | ||
123 | } | 139 | } |
124 | 140 | ||
125 | private void addFolder(InventoryFolderBase folder, bool add) | 141 | private void addFolder(InventoryFolderBase folder, bool add) |
@@ -530,7 +546,21 @@ namespace OpenSim.Data.SQLite | |||
530 | createCol(inv, "inventoryBasePermissions", typeof (Int32)); | 546 | createCol(inv, "inventoryBasePermissions", typeof (Int32)); |
531 | createCol(inv, "inventoryEveryOnePermissions", typeof (Int32)); | 547 | createCol(inv, "inventoryEveryOnePermissions", typeof (Int32)); |
532 | 548 | ||
533 | inv.PrimaryKey = new DataColumn[] {inv.Columns["UUID"]}; | 549 | // sale info |
550 | createCol(inv, "salePrice", typeof(Int32)); | ||
551 | createCol(inv, "saleType", typeof(Byte)); | ||
552 | |||
553 | // creation date | ||
554 | createCol(inv, "creationDate", typeof(Int32)); | ||
555 | |||
556 | // group info | ||
557 | createCol(inv, "groupID", typeof(String)); | ||
558 | createCol(inv, "groupOwned", typeof(Boolean)); | ||
559 | |||
560 | // Flags | ||
561 | createCol(inv, "flags", typeof(UInt32)); | ||
562 | |||
563 | inv.PrimaryKey = new DataColumn[] { inv.Columns["UUID"] }; | ||
534 | return inv; | 564 | return inv; |
535 | } | 565 | } |
536 | 566 | ||
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 4355033..d385376 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -721,7 +721,7 @@ namespace OpenSim.Data.SQLite | |||
721 | createCol(items, "everyonePermissions", typeof (UInt32)); | 721 | createCol(items, "everyonePermissions", typeof (UInt32)); |
722 | createCol(items, "groupPermissions", typeof (UInt32)); | 722 | createCol(items, "groupPermissions", typeof (UInt32)); |
723 | 723 | ||
724 | items.PrimaryKey = new DataColumn[] {items.Columns["itemID"]}; | 724 | items.PrimaryKey = new DataColumn[] { items.Columns["itemID"] }; |
725 | 725 | ||
726 | return items; | 726 | return items; |
727 | } | 727 | } |