diff options
| author | Justin Clarke Casey | 2008-04-30 17:11:59 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-04-30 17:11:59 +0000 |
| commit | dbcd6112b9e23f45638089a528102617af57b4fc (patch) | |
| tree | d5721b44592dbe680c730d679ef462fa3553ad11 | |
| parent | * Patch by Melanie. Implements proper objectflags on child objects. Thanks ... (diff) | |
| download | opensim-SC-dbcd6112b9e23f45638089a528102617af57b4fc.zip opensim-SC-dbcd6112b9e23f45638089a528102617af57b4fc.tar.gz opensim-SC-dbcd6112b9e23f45638089a528102617af57b4fc.tar.bz2 opensim-SC-dbcd6112b9e23f45638089a528102617af57b4fc.tar.xz | |
* Actually enable the inventory upgrade sql if appropriate
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLInventoryData.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 2c781e0..944c2f5 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs | |||
| @@ -101,10 +101,11 @@ namespace OpenSim.Data.MySQL | |||
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | // if the table is already at the current version, then we can exit immediately | 103 | // if the table is already at the current version, then we can exit immediately |
| 104 | // if (oldVersion == "Rev. 2") | 104 | if (oldVersion.StartsWith("Rev. 2;")) |
| 105 | // return; | 105 | { |
| 106 | 106 | m_log.Info("[INVENTORY DB]: Upgrading inventory items table from Rev. 2 to Rev. 3"); | |
| 107 | // database.ExecuteResourceSql("UpgradeItemsTableToVersion2.sql"); | 107 | database.ExecuteResourceSql("UpgradeItemsTableToVersion3.sql"); |
| 108 | } | ||
| 108 | } | 109 | } |
| 109 | 110 | ||
| 110 | private void TestTables(MySqlConnection conn) | 111 | private void TestTables(MySqlConnection conn) |
| @@ -115,8 +116,8 @@ namespace OpenSim.Data.MySQL | |||
| 115 | tableList["inventoryitems"] = null; | 116 | tableList["inventoryitems"] = null; |
| 116 | 117 | ||
| 117 | database.GetTableVersion(tableList); | 118 | database.GetTableVersion(tableList); |
| 118 | m_log.Info("[MYSQL]: Inventory Folder Version: " + tableList["inventoryfolders"]); | 119 | m_log.Info("[INVENTORY DB]: Inventory Folder Version: " + tableList["inventoryfolders"]); |
| 119 | m_log.Info("[MYSQL]: Inventory Items Version: " + tableList["inventoryitems"]); | 120 | m_log.Info("[INVENTORY DB]: Inventory Items Version: " + tableList["inventoryitems"]); |
| 120 | 121 | ||
| 121 | UpgradeFoldersTable(tableList["inventoryfolders"]); | 122 | UpgradeFoldersTable(tableList["inventoryfolders"]); |
| 122 | UpgradeItemsTable(tableList["inventoryitems"]); | 123 | UpgradeItemsTable(tableList["inventoryitems"]); |