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/Grid/GridServer | |
| 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 '')
| -rw-r--r-- | OpenSim/Grid/GridServer/GridServerBase.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index d63ac2e..9b0d7ea 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs | |||
| @@ -29,7 +29,6 @@ using System; | |||
| 29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
| 30 | using System.IO; | 30 | using System.IO; |
| 31 | using System.Reflection; | 31 | using System.Reflection; |
| 32 | using System.Timers; | ||
| 33 | using log4net; | 32 | using log4net; |
| 34 | using Nini.Config; | 33 | using Nini.Config; |
| 35 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
| @@ -115,11 +114,11 @@ namespace OpenSim.Grid.GridServer | |||
| 115 | 114 | ||
| 116 | protected virtual void LoadPlugins() | 115 | protected virtual void LoadPlugins() |
| 117 | { | 116 | { |
| 118 | PluginLoader<IGridPlugin> loader = | 117 | using (PluginLoader<IGridPlugin> loader = new PluginLoader<IGridPlugin>(new GridPluginInitialiser(this))) |
| 119 | new PluginLoader<IGridPlugin>(new GridPluginInitialiser(this)); | 118 | { |
| 120 | 119 | loader.Load("/OpenSim/GridServer"); | |
| 121 | loader.Load("/OpenSim/GridServer"); | 120 | m_plugins = loader.Plugins; |
| 122 | m_plugins = loader.Plugins; | 121 | } |
| 123 | } | 122 | } |
| 124 | 123 | ||
| 125 | public override void ShutdownSpecific() | 124 | public override void ShutdownSpecific() |