aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-25 20:24:21 +0100
committerJustin Clark-Casey (justincc)2011-10-25 20:24:21 +0100
commit8a0a78cbccce796addacab7ed1609279b802a9b3 (patch)
tree31ddb6da7bca6eeb61cb7747532dcf77828cfbe3 /OpenSim/Server
parentDrop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer() (diff)
downloadopensim-SC_OLD-8a0a78cbccce796addacab7ed1609279b802a9b3.zip
opensim-SC_OLD-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.gz
opensim-SC_OLD-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.bz2
opensim-SC_OLD-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 '')
-rw-r--r--OpenSim/Server/Base/HttpServerBase.cs1
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs3
2 files changed, 3 insertions, 1 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;
31using System.Reflection; 31using System.Reflection;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
34using OpenSim.Framework.Servers;
34using OpenSim.Framework.Servers.HttpServer; 35using OpenSim.Framework.Servers.HttpServer;
35using log4net; 36using log4net;
36using Nini.Config; 37using Nini.Config;
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 2652ff2..36e6665 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -30,6 +30,7 @@ using System.IO;
30using System.Xml; 30using System.Xml;
31using System.Threading; 31using System.Threading;
32using System.Reflection; 32using System.Reflection;
33using OpenSim.Framework;
33using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
34using log4net; 35using log4net;
35using log4net.Config; 36using log4net.Config;
@@ -208,7 +209,7 @@ namespace OpenSim.Server.Base
208 } 209 }
209 else 210 else
210 { 211 {
211 consoleAppender.Console = MainConsole.Instance; 212 consoleAppender.Console = (ConsoleBase)MainConsole.Instance;
212 213
213 if (null == consoleAppender.Threshold) 214 if (null == consoleAppender.Threshold)
214 consoleAppender.Threshold = Level.All; 215 consoleAppender.Threshold = Level.All;