let Grid Servers specify a connect string in their configuration.

2 files changed, 14 insertions, 4 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 989ec77..7c5bb0c 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -48,9 +48,9 @@ namespace OpenSim.Data.SQLite
         /// <summary>
         /// Initialises the Grid Interface
         /// </summary>
-        override public void Initialise()
+        override public void Initialise(string connect)
         {
-            database = new SQLiteManager("localhost", "db", "user", "password", "false");
+            database = new SQLiteManager(connect);
         }
 
         /// <summary>
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index e1d2cdf..4d39527 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -49,11 +49,21 @@ namespace OpenSim.Data.SQLite
         /// <param name="username">The username logging into the database</param>
         /// <param name="password">The password for the user logging in</param>
         /// <param name="cpooling">Whether to use connection pooling or not, can be one of the following: 'yes', 'true', 'no' or 'false', if unsure use 'false'.</param>
-        public SQLiteManager(string hostname, string database, string username, string password, string cpooling)
+        public SQLiteManager(string connect)
         {
             try
             {
-                string connectionString = "URI=file:GridServerSqlite.db;";
+                string connectionString = String.Empty;
+                if (connect != String.Empty)
+                {
+                    connectionString = connect;
+                }
+                else
+                {
+                    m_log.Warn("[SQLITE] grid db not specified, using default");
+                    connectionString = "URI=file:GridServerSqlite.db;";
+                }
+
                 dbcon = new SQLiteConnection(connectionString);
 
                 dbcon.Open();