diff options
author | Mike Mazur | 2009-02-09 00:33:44 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-09 00:33:44 +0000 |
commit | 369eef5fcd8e6566d5f953db6a6b093cf674269c (patch) | |
tree | 1f9f1373ec68f48d359d9037c3907d5d1ffd2ecf /OpenSim/Grid | |
parent | * Once again, fixing linked prim collisions by putting AbsolutePosition = Abs... (diff) | |
download | opensim-SC_OLD-369eef5fcd8e6566d5f953db6a6b093cf674269c.zip opensim-SC_OLD-369eef5fcd8e6566d5f953db6a6b093cf674269c.tar.gz opensim-SC_OLD-369eef5fcd8e6566d5f953db6a6b093cf674269c.tar.bz2 opensim-SC_OLD-369eef5fcd8e6566d5f953db6a6b093cf674269c.tar.xz |
The DataPluginFactory is now a set of generic methods instead of
multiple duplicates of the same code.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index c71e53f..4609ee8 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs | |||
@@ -118,7 +118,7 @@ namespace OpenSim.Grid.AssetServer | |||
118 | { | 118 | { |
119 | try | 119 | try |
120 | { | 120 | { |
121 | m_assetProvider = DataPluginFactory.LoadAssetDataPlugin(config.DatabaseProvider, config.DatabaseConnect); | 121 | m_assetProvider = DataPluginFactory.LoadDataPlugin<IAssetDataPlugin>(config.DatabaseProvider, config.DatabaseConnect); |
122 | if (m_assetProvider == null) | 122 | if (m_assetProvider == null) |
123 | { | 123 | { |
124 | m_log.Error("[ASSET]: Failed to load a database plugin, server halting"); | 124 | m_log.Error("[ASSET]: Failed to load a database plugin, server halting"); |
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 3fc0393..f98809d 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -83,8 +83,8 @@ namespace OpenSim.Grid.GridServer | |||
83 | /// </param> | 83 | /// </param> |
84 | public void AddPlugin(string provider, string connect) | 84 | public void AddPlugin(string provider, string connect) |
85 | { | 85 | { |
86 | _plugins = DataPluginFactory.LoadGridDataPlugins(provider, connect); | 86 | _plugins = DataPluginFactory.LoadDataPlugins<IGridDataPlugin>(provider, connect); |
87 | _logplugins = DataPluginFactory.LoadLogDataPlugins(provider, connect); | 87 | _logplugins = DataPluginFactory.LoadDataPlugins<ILogDataPlugin>(provider, connect); |
88 | } | 88 | } |
89 | 89 | ||
90 | /// <summary> | 90 | /// <summary> |