aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorSean Dague2008-04-23 19:13:06 +0000
committerSean Dague2008-04-23 19:13:06 +0000
commita1cc0e436ff9081f3c0a76de861ed0673cd36142 (patch)
tree31d775f3e17109b5b6765e89b73da9f036172328 /OpenSim/Data/SQLite
parent* Fix a console issue where pressing return on some operating systems cause t... (diff)
downloadopensim-SC_OLD-a1cc0e436ff9081f3c0a76de861ed0673cd36142.zip
opensim-SC_OLD-a1cc0e436ff9081f3c0a76de861ed0673cd36142.tar.gz
opensim-SC_OLD-a1cc0e436ff9081f3c0a76de861ed0673cd36142.tar.bz2
opensim-SC_OLD-a1cc0e436ff9081f3c0a76de861ed0673cd36142.tar.xz
changes to allow asset_source to be specified in the opensim.ini
this will work for sqlite and nhibernate, but will be ignored for mysql and mssql (reverting to their ini files) until someone writes that bit.
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 2b63d2b..0d8b468 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -56,9 +56,12 @@ namespace OpenSim.Data.SQLite
56 56
57 private SqliteConnection m_conn; 57 private SqliteConnection m_conn;
58 58
59 public void Initialise(string dbfile, string dbname) 59 override public void Initialise(string dbconnect)
60 { 60 {
61 m_conn = new SqliteConnection("URI=file:" + dbfile + ",version=3"); 61 if (dbconnect == string.Empty) {
62 dbconnect = "URI=file:AssetStorage.db,version=3";
63 }
64 m_conn = new SqliteConnection(dbconnect);
62 m_conn.Open(); 65 m_conn.Open();
63 TestTables(m_conn); 66 TestTables(m_conn);
64 return; 67 return;
@@ -289,7 +292,7 @@ namespace OpenSim.Data.SQLite
289 292
290 override public void Initialise() 293 override public void Initialise()
291 { 294 {
292 Initialise("AssetStorage.db", ""); 295 Initialise("URI=file:AssetStorage.db,version=3");
293 } 296 }
294 297
295 override public string Name 298 override public string Name