From 3f95804911d1a1bc4b50518c047f073120306d72 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 23 Apr 2008 20:57:18 +0000
Subject: add a database_connect field for the asset server config which will
 let you specify a connection string.  Required for Nhibernate, optional for
 sqlite (there is a sane default), ignored for mysql and mssql until someone
 implements the Iniatialise(string) method.

---
 OpenSim/Grid/AssetServer/Main.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Grid/AssetServer')

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 5a013b9..26f4bc8 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Grid.AssetServer
             return null;
         }
 
-        public IAssetProvider LoadDatabasePlugin(string FileName)
+        public IAssetProvider LoadDatabasePlugin(string FileName, string connect)
         {
             m_log.Info("[ASSET SERVER]: LoadDatabasePlugin: Attempting to load " + FileName);
             Assembly pluginAssembly = Assembly.LoadFrom(FileName);
@@ -132,7 +132,7 @@ namespace OpenSim.Grid.AssetServer
                         IAssetProvider plug =
                             (IAssetProvider) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
                         assetPlugin = plug;
-                        assetPlugin.Initialise();
+                        assetPlugin.Initialise(connect);
 
                         m_log.Info("[ASSET SERVER]: Added " + assetPlugin.Name + " " + assetPlugin.Version);
                         break;
@@ -150,7 +150,7 @@ namespace OpenSim.Grid.AssetServer
         {
             try
             {
-                m_assetProvider = LoadDatabasePlugin(config.DatabaseProvider);
+                m_assetProvider = LoadDatabasePlugin(config.DatabaseProvider, config.DatabaseConnect);
                 if (m_assetProvider == null)
                 {
                     m_log.Error("[ASSET]: Failed to load a database plugin, server halting");
-- 
cgit v1.1