From a1cc0e436ff9081f3c0a76de861ed0673cd36142 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 23 Apr 2008 19:13:06 +0000
Subject: 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.

---
 OpenSim/Data/SQLite/SQLiteAssetData.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Data/SQLite/SQLiteAssetData.cs')

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
-- 
cgit v1.1