aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorSean Dague2008-05-28 17:59:46 +0000
committerSean Dague2008-05-28 17:59:46 +0000
commit89c164fbc18e082bf2d036bd2167b824e90aebc1 (patch)
tree9042b06429cb3941b04f79af084c13d022d861e7 /OpenSim/Grid
parent* Minor: Another small log adjustment (diff)
downloadopensim-SC-89c164fbc18e082bf2d036bd2167b824e90aebc1.zip
opensim-SC-89c164fbc18e082bf2d036bd2167b824e90aebc1.tar.gz
opensim-SC-89c164fbc18e082bf2d036bd2167b824e90aebc1.tar.bz2
opensim-SC-89c164fbc18e082bf2d036bd2167b824e90aebc1.tar.xz
let Grid Servers specify a connect string in their configuration.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs6
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs2
2 files changed, 4 insertions, 4 deletions
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
58 /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded. 58 /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.
59 /// </summary> 59 /// </summary>
60 /// <param name="FileName">The filename to the grid server plugin DLL</param> 60 /// <param name="FileName">The filename to the grid server plugin DLL</param>
61 public void AddPlugin(string FileName) 61 public void AddPlugin(string FileName, string Connect)
62 { 62 {
63 m_log.Info("[DATA]: Attempting to load " + FileName); 63 m_log.Info("[DATA]: Attempting to load " + FileName);
64 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 64 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
@@ -75,7 +75,7 @@ namespace OpenSim.Grid.GridServer
75 { 75 {
76 IGridData plug = 76 IGridData plug =
77 (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 77 (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
78 plug.Initialise(); 78 plug.Initialise(Connect);
79 _plugins.Add(plug.getName(), plug); 79 _plugins.Add(plug.getName(), plug);
80 m_log.Info("[DATA]: Added IGridData Interface"); 80 m_log.Info("[DATA]: Added IGridData Interface");
81 } 81 }
@@ -87,7 +87,7 @@ namespace OpenSim.Grid.GridServer
87 { 87 {
88 ILogData plug = 88 ILogData plug =
89 (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 89 (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
90 plug.Initialise(); 90 plug.Initialise(Connect);
91 _logplugins.Add(plug.getName(), plug); 91 _logplugins.Add(plug.getName(), plug);
92 m_log.Info("[DATA]: Added ILogData Interface"); 92 m_log.Info("[DATA]: Added ILogData Interface");
93 } 93 }
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
135 { 135 {
136 m_log.Info("[DATA]: Connecting to Storage Server"); 136 m_log.Info("[DATA]: Connecting to Storage Server");
137 m_gridManager = new GridManager(); 137 m_gridManager = new GridManager();
138 m_gridManager.AddPlugin(m_config.DatabaseProvider); 138 m_gridManager.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);
139 m_gridManager.Config = m_config; 139 m_gridManager.Config = m_config;
140 } 140 }
141 141