diff options
| author | Melanie | 2011-10-26 17:55:53 +0200 |
|---|---|---|
| committer | Melanie | 2011-10-26 17:55:53 +0200 |
| commit | c763419043773c93dbbc865ec35f7ecf856a641a (patch) | |
| tree | ac9f99c33ae788e6b7fdfd0843c2ae584a896dc6 /OpenSim/Server/Base/HttpServerBase.cs | |
| parent | Fix a missing locking call (diff) | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| download | opensim-SC_OLD-c763419043773c93dbbc865ec35f7ecf856a641a.zip opensim-SC_OLD-c763419043773c93dbbc865ec35f7ecf856a641a.tar.gz opensim-SC_OLD-c763419043773c93dbbc865ec35f7ecf856a641a.tar.bz2 opensim-SC_OLD-c763419043773c93dbbc865ec35f7ecf856a641a.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Server/Base/HttpServerBase.cs')
| -rw-r--r-- | OpenSim/Server/Base/HttpServerBase.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs index bb5ce96..d471559 100644 --- a/OpenSim/Server/Base/HttpServerBase.cs +++ b/OpenSim/Server/Base/HttpServerBase.cs | |||
| @@ -31,6 +31,7 @@ using System.Threading; | |||
| 31 | using System.Reflection; | 31 | using System.Reflection; |
| 32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
| 33 | using OpenSim.Framework.Console; | 33 | using OpenSim.Framework.Console; |
| 34 | using OpenSim.Framework.Servers; | ||
| 34 | using OpenSim.Framework.Servers.HttpServer; | 35 | using OpenSim.Framework.Servers.HttpServer; |
| 35 | using log4net; | 36 | using log4net; |
| 36 | using Nini.Config; | 37 | using Nini.Config; |