diff options
author | Melanie | 2009-10-27 11:32:11 +0000 |
---|---|---|
committer | Melanie | 2009-10-27 11:32:11 +0000 |
commit | 31a848e97bd984ab0a85feca397ce419f6ae839a (patch) | |
tree | 4743f5eb7c12b3723ed4b986d19714d1b3a0a3ea /OpenSim/Data/DataPluginFactory.cs | |
parent | Commented out instrumentation in ODEPrim.cs (diff) | |
parent | Finally hunted down the Parallel deadlock. Packets were being handled asynchr... (diff) | |
download | opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.zip opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.gz opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.bz2 opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Data/DataPluginFactory.cs')
-rw-r--r-- | OpenSim/Data/DataPluginFactory.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Data/DataPluginFactory.cs b/OpenSim/Data/DataPluginFactory.cs index 718c6b2..841f71e 100644 --- a/OpenSim/Data/DataPluginFactory.cs +++ b/OpenSim/Data/DataPluginFactory.cs | |||
@@ -119,14 +119,15 @@ namespace OpenSim.Data | |||
119 | 119 | ||
120 | PluginLoaderParamFactory<T>(connect, out pluginInitialiser, out extensionPointPath); | 120 | PluginLoaderParamFactory<T>(connect, out pluginInitialiser, out extensionPointPath); |
121 | 121 | ||
122 | PluginLoader<T> loader = new PluginLoader<T>(pluginInitialiser); | 122 | using (PluginLoader<T> loader = new PluginLoader<T>(pluginInitialiser)) |
123 | 123 | { | |
124 | // loader will try to load all providers (MySQL, MSSQL, etc) | 124 | // loader will try to load all providers (MySQL, MSSQL, etc) |
125 | // unless it is constrainted to the correct "Provider" entry in the addin.xml | 125 | // unless it is constrainted to the correct "Provider" entry in the addin.xml |
126 | loader.Add(extensionPointPath, new PluginProviderFilter(provider)); | 126 | loader.Add(extensionPointPath, new PluginProviderFilter(provider)); |
127 | loader.Load(); | 127 | loader.Load(); |
128 | 128 | ||
129 | return loader.Plugins; | 129 | return loader.Plugins; |
130 | } | ||
130 | } | 131 | } |
131 | 132 | ||
132 | /// <summary> | 133 | /// <summary> |