diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 12 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/IGridPlugin.cs | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index ebc6ac3..0b4b4ac 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -73,18 +73,18 @@ namespace OpenSim.Grid.GridServer | |||
73 | provider = String.Join (".", s); | 73 | provider = String.Join (".", s); |
74 | 74 | ||
75 | PluginLoader<IGridDataPlugin> gridloader = | 75 | PluginLoader<IGridDataPlugin> gridloader = |
76 | new PluginLoader<IGridDataPlugin> (new GridDataStoreInitialiser (connect)); | 76 | new PluginLoader<IGridDataPlugin> (new GridDataInitialiser (connect)); |
77 | 77 | ||
78 | PluginLoader<ILogDataPlugin> logloader = | 78 | PluginLoader<ILogDataPlugin> logloader = |
79 | new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect)); | 79 | new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect)); |
80 | 80 | ||
81 | gridloader.AddExtensionPoint ("/OpenSim/GridDataStore"); | 81 | gridloader.AddExtensionPoint ("/OpenSim/GridData"); |
82 | logloader.AddExtensionPoint ("/OpenSim/GridLogData"); | 82 | logloader.AddExtensionPoint ("/OpenSim/LogData"); |
83 | 83 | ||
84 | // loader will try to load all providers (MySQL, MSSQL, etc) | 84 | // loader will try to load all providers (MySQL, MSSQL, etc) |
85 | // unless it is constrainted to the correct "id" | 85 | // unless it is constrainted to the correct "id" |
86 | gridloader.AddFilter ("/OpenSim/GridDataStore", new PluginIdFilter (provider + "GridData")); | 86 | //gridloader.AddFilter ("/OpenSim/GridData", new PluginIdFilter (provider + "GridData")); |
87 | logloader.AddFilter ("/OpenSim/GridLogData", new PluginIdFilter (provider + "LogData")); | 87 | //logloader.AddFilter ("/OpenSim/LogData", new PluginIdFilter (provider + "LogData")); |
88 | 88 | ||
89 | gridloader.Load(); | 89 | gridloader.Load(); |
90 | logloader.Load(); | 90 | logloader.Load(); |
@@ -111,7 +111,7 @@ namespace OpenSim.Grid.GridServer | |||
111 | } | 111 | } |
112 | catch (Exception) | 112 | catch (Exception) |
113 | { | 113 | { |
114 | m_log.Warn("[storage]: Unable to write log via "); | 114 | m_log.Warn("[storage]: Unable to write log via " + plugin.Name); |
115 | } | 115 | } |
116 | } | 116 | } |
117 | } | 117 | } |
diff --git a/OpenSim/Grid/GridServer/IGridPlugin.cs b/OpenSim/Grid/GridServer/IGridPlugin.cs index 418caec..71c357b 100644 --- a/OpenSim/Grid/GridServer/IGridPlugin.cs +++ b/OpenSim/Grid/GridServer/IGridPlugin.cs | |||
@@ -26,14 +26,10 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | using Mono.Addins; | ||
30 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
31 | 30 | ||
32 | [assembly : AddinRoot("OpenSim.Grid.GridServer", "0.5")] | ||
33 | |||
34 | namespace OpenSim.Grid.GridServer | 31 | namespace OpenSim.Grid.GridServer |
35 | { | 32 | { |
36 | [TypeExtensionPoint("/OpenSim/GridServer")] | ||
37 | public interface IGridPlugin : IPlugin | 33 | public interface IGridPlugin : IPlugin |
38 | { | 34 | { |
39 | void Initialise(GridServerBase gridServer); | 35 | void Initialise(GridServerBase gridServer); |