diff options
| author | Justin Clark-Casey (justincc) | 2011-10-25 20:24:21 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-10-25 20:24:21 +0100 |
| commit | 8a0a78cbccce796addacab7ed1609279b802a9b3 (patch) | |
| tree | 31ddb6da7bca6eeb61cb7747532dcf77828cfbe3 /OpenSim/Server/Base/HttpServerBase.cs | |
| parent | Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer() (diff) | |
| download | opensim-SC-8a0a78cbccce796addacab7ed1609279b802a9b3.zip opensim-SC-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.gz opensim-SC-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.bz2 opensim-SC-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.xz | |
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
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; |