diff options
author | Sean Dague | 2008-04-23 20:48:23 +0000 |
---|---|---|
committer | Sean Dague | 2008-04-23 20:48:23 +0000 |
commit | 3dd98a112f4308532d768943690b13c403dff68b (patch) | |
tree | 6c33ceb05d8c431720ffca11be2d025a1782fc78 /OpenSim/Data/SQLite | |
parent | changes to allow asset_source to be specified in the opensim.ini (diff) | |
download | opensim-SC-3dd98a112f4308532d768943690b13c403dff68b.zip opensim-SC-3dd98a112f4308532d768943690b13c403dff68b.tar.gz opensim-SC-3dd98a112f4308532d768943690b13c403dff68b.tar.bz2 opensim-SC-3dd98a112f4308532d768943690b13c403dff68b.tar.xz |
allow for Inventory database source to be specified in main
configs. This works with sqlite and nhibernate backends, and
stays with default seperate ini files for mysql and mssql until
someone writes those.
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs index 442ba39..2eb0ad5 100644 --- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs | |||
@@ -50,17 +50,13 @@ namespace OpenSim.Data.SQLite | |||
50 | /// <summary> | 50 | /// <summary> |
51 | /// Initialises the interface | 51 | /// Initialises the interface |
52 | /// </summary> | 52 | /// </summary> |
53 | public void Initialise() | 53 | public void Initialise(string dbconnect) |
54 | { | 54 | { |
55 | Initialise("inventoryStore.db", "inventoryDatabase"); | 55 | if (dbconnect == string.Empty) { |
56 | } | 56 | dbconnect = "URI=file:inventoryStore.db,version=3"; |
57 | 57 | } | |
58 | public void Initialise(string dbfile, string dbname) | 58 | m_log.Info("[Inventory]: Sqlite - connecting: " + dbconnect); |
59 | { | 59 | SqliteConnection conn = new SqliteConnection(dbconnect); |
60 | string connectionString = "URI=file:" + dbfile + ",version=3"; | ||
61 | |||
62 | m_log.Info("[Inventory]: Sqlite - connecting: " + dbfile); | ||
63 | SqliteConnection conn = new SqliteConnection(connectionString); | ||
64 | 60 | ||
65 | conn.Open(); | 61 | conn.Open(); |
66 | 62 | ||