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.

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
 
         private SqliteConnection m_conn;
 
-        public void Initialise(string dbfile, string dbname)
+        override public void Initialise(string dbconnect)
         {
-            m_conn = new SqliteConnection("URI=file:" + dbfile + ",version=3");
+            if (dbconnect == string.Empty) {
+                dbconnect = "URI=file:AssetStorage.db,version=3";
+            }
+            m_conn = new SqliteConnection(dbconnect);
             m_conn.Open();
             TestTables(m_conn);
             return;
@@ -289,7 +292,7 @@ namespace OpenSim.Data.SQLite
 
         override public void Initialise()
         {
-            Initialise("AssetStorage.db", "");
+            Initialise("URI=file:AssetStorage.db,version=3");
         }
 
         override public string Name