diff options
| author | Mike Mazur | 2009-02-16 02:27:09 +0000 |
|---|---|---|
| committer | Mike Mazur | 2009-02-16 02:27:09 +0000 |
| commit | 1778f799ba8f3072d9d75e6c458d17681a597e67 (patch) | |
| tree | a9435461f36799eea88c4848489f1fd65c4e1c74 /OpenSim/Grid/AssetInventoryServer | |
| parent | - add list for backend plugins and Dispose() all plugins on shutdown (diff) | |
| download | opensim-SC-1778f799ba8f3072d9d75e6c458d17681a597e67.zip opensim-SC-1778f799ba8f3072d9d75e6c458d17681a597e67.tar.gz opensim-SC-1778f799ba8f3072d9d75e6c458d17681a597e67.tar.bz2 opensim-SC-1778f799ba8f3072d9d75e6c458d17681a597e67.tar.xz | |
Update to new generic DataPluginFactory calls.
Diffstat (limited to 'OpenSim/Grid/AssetInventoryServer')
| -rw-r--r-- | OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs index eb000ae..b5bc70e 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs | |||
| @@ -272,7 +272,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim | |||
| 272 | 272 | ||
| 273 | try | 273 | try |
| 274 | { | 274 | { |
| 275 | m_assetProvider = DataPluginFactory.LoadAssetDataPlugin("OpenSim.Data.MySQL.dll", server.ConfigFile.Configs["MySQL"].GetString("database_connect", null)); | 275 | m_assetProvider = DataPluginFactory.LoadDataPlugin<IAssetDataPlugin>("OpenSim.Data.MySQL.dll", server.ConfigFile.Configs["MySQL"].GetString("database_connect", null)); |
| 276 | if (m_assetProvider == null) | 276 | if (m_assetProvider == null) |
| 277 | { | 277 | { |
| 278 | Logger.Log.Error("[ASSET]: Failed to load a database plugin, server halting."); | 278 | Logger.Log.Error("[ASSET]: Failed to load a database plugin, server halting."); |
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs index a41c48d..a7d2f92 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs | |||
| @@ -789,7 +789,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim | |||
| 789 | 789 | ||
| 790 | try | 790 | try |
| 791 | { | 791 | { |
| 792 | m_inventoryProvider = DataPluginFactory.LoadInventoryDataPlugin("OpenSim.Data.MySQL.dll", server.ConfigFile.Configs["MySQL"].GetString("database_connect", null)); | 792 | m_inventoryProvider = DataPluginFactory.LoadDataPlugin<IInventoryDataPlugin>("OpenSim.Data.MySQL.dll", server.ConfigFile.Configs["MySQL"].GetString("database_connect", null)); |
| 793 | if (m_inventoryProvider == null) | 793 | if (m_inventoryProvider == null) |
| 794 | { | 794 | { |
| 795 | Logger.Log.Error("[INVENTORY]: Failed to load a database plugin, server halting."); | 795 | Logger.Log.Error("[INVENTORY]: Failed to load a database plugin, server halting."); |