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/Region/Application/OpenSimBase.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/Region/Application/OpenSimBase.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 3df3a1c..cc18f1a 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -162,11 +162,11 @@ namespace OpenSim | |||
| 162 | 162 | ||
| 163 | protected virtual void LoadPlugins() | 163 | protected virtual void LoadPlugins() |
| 164 | { | 164 | { |
| 165 | PluginLoader<IApplicationPlugin> loader = | 165 | using (PluginLoader<IApplicationPlugin> loader = new PluginLoader<IApplicationPlugin>(new ApplicationPluginInitialiser(this))) |
| 166 | new PluginLoader<IApplicationPlugin>(new ApplicationPluginInitialiser(this)); | 166 | { |
| 167 | 167 | loader.Load("/OpenSim/Startup"); | |
| 168 | loader.Load("/OpenSim/Startup"); | 168 | m_plugins = loader.Plugins; |
| 169 | m_plugins = loader.Plugins; | 169 | } |
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | protected override List<string> GetHelpTopics() | 172 | protected override List<string> GetHelpTopics() |