aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs15
1 files changed, 2 insertions, 13 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 0b4b4ac..ec3ca19 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -61,17 +61,6 @@ namespace OpenSim.Grid.GridServer
61 /// <param name="provider">The name of the grid server plugin DLL</param> 61 /// <param name="provider">The name of the grid server plugin DLL</param>
62 public void AddPlugin(string provider, string connect) 62 public void AddPlugin(string provider, string connect)
63 { 63 {
64 // FIXME: convert "provider" DLL file name to Mono.Addins "id",
65 // which unless it is changed in the source code, is the .NET namespace.
66 // In the future, the "provider" should be changed to "id" in the
67 // config files, and is independent of filenames or namespaces.
68 string[] s = provider.Split ('.');
69 int len = s.Length;
70 if ((len >= 2) && (s [len-1] == "dll"))
71 s [len-1] = s [len-2];
72
73 provider = String.Join (".", s);
74
75 PluginLoader<IGridDataPlugin> gridloader = 64 PluginLoader<IGridDataPlugin> gridloader =
76 new PluginLoader<IGridDataPlugin> (new GridDataInitialiser (connect)); 65 new PluginLoader<IGridDataPlugin> (new GridDataInitialiser (connect));
77 66
@@ -83,8 +72,8 @@ namespace OpenSim.Grid.GridServer
83 72
84 // loader will try to load all providers (MySQL, MSSQL, etc) 73 // loader will try to load all providers (MySQL, MSSQL, etc)
85 // unless it is constrainted to the correct "id" 74 // unless it is constrainted to the correct "id"
86 //gridloader.AddFilter ("/OpenSim/GridData", new PluginIdFilter (provider + "GridData")); 75 gridloader.AddFilter ("/OpenSim/GridData", new PluginIdFilter (provider));
87 //logloader.AddFilter ("/OpenSim/LogData", new PluginIdFilter (provider + "LogData")); 76 logloader.AddFilter ("/OpenSim/LogData", new PluginIdFilter (provider));
88 77
89 gridloader.Load(); 78 gridloader.Load();
90 logloader.Load(); 79 logloader.Load();