From 89c164fbc18e082bf2d036bd2167b824e90aebc1 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 28 May 2008 17:59:46 +0000
Subject: let Grid Servers specify a connect string in their configuration.

---
 OpenSim/Grid/GridServer/GridManager.cs    | 6 +++---
 OpenSim/Grid/GridServer/GridServerBase.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Grid')

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index d0eec32..2933f04 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Grid.GridServer
         /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.
         /// </summary>
         /// <param name="FileName">The filename to the grid server plugin DLL</param>
-        public void AddPlugin(string FileName)
+        public void AddPlugin(string FileName, string Connect)
         {
             m_log.Info("[DATA]: Attempting to load " + FileName);
             Assembly pluginAssembly = Assembly.LoadFrom(FileName);
@@ -75,7 +75,7 @@ namespace OpenSim.Grid.GridServer
                     {
                         IGridData plug =
                             (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                        plug.Initialise();
+                        plug.Initialise(Connect);
                         _plugins.Add(plug.getName(), plug);
                         m_log.Info("[DATA]: Added IGridData Interface");
                     }
@@ -87,7 +87,7 @@ namespace OpenSim.Grid.GridServer
                     {
                         ILogData plug =
                             (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                        plug.Initialise();
+                        plug.Initialise(Connect);
                         _logplugins.Add(plug.getName(), plug);
                         m_log.Info("[DATA]: Added ILogData Interface");
                     }
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 4e29cbf..263866a 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Grid.GridServer
         {
             m_log.Info("[DATA]: Connecting to Storage Server");
             m_gridManager = new GridManager();
-            m_gridManager.AddPlugin(m_config.DatabaseProvider);
+            m_gridManager.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);
             m_gridManager.Config = m_config;
         }
 
-- 
cgit v1.1