diff options
author | Jeff Ames | 2008-08-18 00:39:10 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-18 00:39:10 +0000 |
commit | 6ef9d4da901a346c232458317cca6268da888e2e (patch) | |
tree | dd1d935b10f34f261839da9f9879c02322e8ede7 /OpenSim/Grid/GridServer | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.zip opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.gz opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.bz2 opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.xz |
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 12 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/IGridPlugin.cs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 3101a38..98abd53 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -61,20 +61,20 @@ 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 | PluginLoader<IGridDataPlugin> gridloader = | 64 | PluginLoader<IGridDataPlugin> gridloader = |
65 | new PluginLoader<IGridDataPlugin> (new GridDataInitialiser (connect)); | 65 | new PluginLoader<IGridDataPlugin> (new GridDataInitialiser (connect)); |
66 | 66 | ||
67 | PluginLoader<ILogDataPlugin> logloader = | 67 | PluginLoader<ILogDataPlugin> logloader = |
68 | new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect)); | 68 | new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect)); |
69 | 69 | ||
70 | // loader will try to load all providers (MySQL, MSSQL, etc) | 70 | // loader will try to load all providers (MySQL, MSSQL, etc) |
71 | // unless it is constrainted to the correct "Provider" entry in the addin.xml | 71 | // unless it is constrainted to the correct "Provider" entry in the addin.xml |
72 | gridloader.Add ("/OpenSim/GridData", new PluginProviderFilter (provider)); | 72 | gridloader.Add ("/OpenSim/GridData", new PluginProviderFilter (provider)); |
73 | logloader.Add ("/OpenSim/LogData", new PluginProviderFilter (provider)); | 73 | logloader.Add ("/OpenSim/LogData", new PluginProviderFilter (provider)); |
74 | 74 | ||
75 | gridloader.Load(); | 75 | gridloader.Load(); |
76 | logloader.Load(); | 76 | logloader.Load(); |
77 | 77 | ||
78 | _plugins = gridloader.Plugins; | 78 | _plugins = gridloader.Plugins; |
79 | _logplugins = logloader.Plugins; | 79 | _logplugins = logloader.Plugins; |
80 | } | 80 | } |
@@ -382,7 +382,7 @@ namespace OpenSim.Grid.GridServer | |||
382 | string logMsg = e.Message; | 382 | string logMsg = e.Message; |
383 | if (e.InnerException != null) | 383 | if (e.InnerException != null) |
384 | logMsg += ", " + e.InnerException.Message; | 384 | logMsg += ", " + e.InnerException.Message; |
385 | 385 | ||
386 | m_log.WarnFormat("[LOGIN END]: {0}", logMsg); | 386 | m_log.WarnFormat("[LOGIN END]: {0}", logMsg); |
387 | 387 | ||
388 | return e.XmlRpcErrorResponse; | 388 | return e.XmlRpcErrorResponse; |
diff --git a/OpenSim/Grid/GridServer/IGridPlugin.cs b/OpenSim/Grid/GridServer/IGridPlugin.cs index 71c357b..e2557c0 100644 --- a/OpenSim/Grid/GridServer/IGridPlugin.cs +++ b/OpenSim/Grid/GridServer/IGridPlugin.cs | |||
@@ -34,7 +34,7 @@ namespace OpenSim.Grid.GridServer | |||
34 | { | 34 | { |
35 | void Initialise(GridServerBase gridServer); | 35 | void Initialise(GridServerBase gridServer); |
36 | } | 36 | } |
37 | 37 | ||
38 | public class GridPluginInitialiser : PluginInitialiserBase | 38 | public class GridPluginInitialiser : PluginInitialiserBase |
39 | { | 39 | { |
40 | private GridServerBase server; | 40 | private GridServerBase server; |