aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/EventQueue
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-15 02:03:50 +0100
committerJustin Clark-Casey (justincc)2012-06-15 02:03:50 +0100
commit257b1b517dec58bf902bac63bc7ab7080286d415 (patch)
treee0528b6032f1403cbcd03a216b527c565a2ac777 /OpenSim/Region/ClientStack/Linden/Caps/EventQueue
parentminor: Tell user the current debug http level if "debug http" console command... (diff)
downloadopensim-SC_OLD-257b1b517dec58bf902bac63bc7ab7080286d415.zip
opensim-SC_OLD-257b1b517dec58bf902bac63bc7ab7080286d415.tar.gz
opensim-SC_OLD-257b1b517dec58bf902bac63bc7ab7080286d415.tar.bz2
opensim-SC_OLD-257b1b517dec58bf902bac63bc7ab7080286d415.tar.xz
Add main instance to internal MainServer.m_Servers list to simplify internal logic.
This does require the server to be added before it is set as the main Instance
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index c25b58c..cd70410 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -51,7 +51,16 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
51 [SetUp] 51 [SetUp]
52 public void SetUp() 52 public void SetUp()
53 { 53 {
54 MainServer.Instance = new BaseHttpServer(9999, false, 9998, ""); 54 uint port = 9999;
55 uint sslPort = 9998;
56
57 // This is an unfortunate bit of clean up we have to do because MainServer manages things through static
58 // variables and the VM is not restarted between tests.
59 MainServer.RemoveHttpServer(port);
60
61 BaseHttpServer server = new BaseHttpServer(port, false, sslPort, "");
62 MainServer.AddHttpServer(server);
63 MainServer.Instance = server;
55 64
56 IConfigSource config = new IniConfigSource(); 65 IConfigSource config = new IniConfigSource();
57 config.AddConfig("Startup"); 66 config.AddConfig("Startup");