diff options
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs index b638528..5122167 100644 --- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Data.SQLite | |||
55 | if (dbconnect == string.Empty) { | 55 | if (dbconnect == string.Empty) { |
56 | dbconnect = "URI=file:inventoryStore.db,version=3"; | 56 | dbconnect = "URI=file:inventoryStore.db,version=3"; |
57 | } | 57 | } |
58 | m_log.Info("[Inventory]: Sqlite - connecting: " + dbconnect); | 58 | m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect); |
59 | SqliteConnection conn = new SqliteConnection(dbconnect); | 59 | SqliteConnection conn = new SqliteConnection(dbconnect); |
60 | 60 | ||
61 | conn.Open(); | 61 | conn.Open(); |
@@ -74,12 +74,12 @@ namespace OpenSim.Data.SQLite | |||
74 | ds.Tables.Add(createInventoryFoldersTable()); | 74 | ds.Tables.Add(createInventoryFoldersTable()); |
75 | invFoldersDa.Fill(ds.Tables["inventoryfolders"]); | 75 | invFoldersDa.Fill(ds.Tables["inventoryfolders"]); |
76 | setupFoldersCommands(invFoldersDa, conn); | 76 | setupFoldersCommands(invFoldersDa, conn); |
77 | m_log.Info("[DATASTORE]: Populated Inventory Folders Definitions"); | 77 | m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions"); |
78 | 78 | ||
79 | ds.Tables.Add(createInventoryItemsTable()); | 79 | ds.Tables.Add(createInventoryItemsTable()); |
80 | invItemsDa.Fill(ds.Tables["inventoryitems"]); | 80 | invItemsDa.Fill(ds.Tables["inventoryitems"]); |
81 | setupItemsCommands(invItemsDa, conn); | 81 | setupItemsCommands(invItemsDa, conn); |
82 | m_log.Info("[DATASTORE]: Populated Inventory Items Definitions"); | 82 | m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions"); |
83 | 83 | ||
84 | ds.AcceptChanges(); | 84 | ds.AcceptChanges(); |
85 | } | 85 | } |
@@ -674,7 +674,7 @@ namespace OpenSim.Data.SQLite | |||
674 | } | 674 | } |
675 | catch (SqliteSyntaxException) | 675 | catch (SqliteSyntaxException) |
676 | { | 676 | { |
677 | m_log.Info("[DATASTORE]: SQLite Database doesn't exist... creating"); | 677 | m_log.Info("[INVENTORY DB]: SQLite Database doesn't exist... creating"); |
678 | InitDB(conn); | 678 | InitDB(conn); |
679 | } | 679 | } |
680 | 680 | ||
@@ -693,7 +693,7 @@ namespace OpenSim.Data.SQLite | |||
693 | } | 693 | } |
694 | catch (SqliteSyntaxException) | 694 | catch (SqliteSyntaxException) |
695 | { | 695 | { |
696 | m_log.Info("[DATASTORE]: Upgrading sqlite inventory database to version 2"); | 696 | m_log.Info("[INVENTORY DB]: Upgrading sqlite inventory database to version 2"); |
697 | 697 | ||
698 | cmd = new SqliteCommand("alter table inventoryitems add column salePrice integer default 99;", conn); | 698 | cmd = new SqliteCommand("alter table inventoryitems add column salePrice integer default 99;", conn); |
699 | cmd.ExecuteNonQuery(); | 699 | cmd.ExecuteNonQuery(); |
@@ -719,7 +719,7 @@ namespace OpenSim.Data.SQLite | |||
719 | { | 719 | { |
720 | if (! tmpDS.Tables["inventoryitems"].Columns.Contains(col.ColumnName)) | 720 | if (! tmpDS.Tables["inventoryitems"].Columns.Contains(col.ColumnName)) |
721 | { | 721 | { |
722 | m_log.Info("[DATASTORE]: Missing required column:" + col.ColumnName); | 722 | m_log.Info("[INVENTORY DB]: Missing required column:" + col.ColumnName); |
723 | return false; | 723 | return false; |
724 | } | 724 | } |
725 | } | 725 | } |
@@ -727,7 +727,7 @@ namespace OpenSim.Data.SQLite | |||
727 | { | 727 | { |
728 | if (! tmpDS.Tables["inventoryfolders"].Columns.Contains(col.ColumnName)) | 728 | if (! tmpDS.Tables["inventoryfolders"].Columns.Contains(col.ColumnName)) |
729 | { | 729 | { |
730 | m_log.Info("[DATASTORE]: Missing required column:" + col.ColumnName); | 730 | m_log.Info("[INVENTORY DB]: Missing required column:" + col.ColumnName); |
731 | return false; | 731 | return false; |
732 | } | 732 | } |
733 | } | 733 | } |