aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Setup
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-10 03:54:22 +0000
committerMelanie Thielker2009-07-10 03:54:22 +0000
commit8c8edb0c4e95da426cadb699ce72d2e282bb39ed (patch)
tree570efa8a190305b4a0e2a324b768e373a40e32c7 /OpenSim/Tests/Common/Setup
parentThis extra assignment to the singleton should not be needed but may help make (diff)
downloadopensim-SC_OLD-8c8edb0c4e95da426cadb699ce72d2e282bb39ed.zip
opensim-SC_OLD-8c8edb0c4e95da426cadb699ce72d2e282bb39ed.tar.gz
opensim-SC_OLD-8c8edb0c4e95da426cadb699ce72d2e282bb39ed.tar.bz2
opensim-SC_OLD-8c8edb0c4e95da426cadb699ce72d2e282bb39ed.tar.xz
Explicitly set up the http server singleton fo the tests
Diffstat (limited to 'OpenSim/Tests/Common/Setup')
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 621966d..7f5d8e6 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -34,6 +34,7 @@ using OpenSim.Framework;
34using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Framework.Servers.HttpServer;
37using OpenSim.Region.Physics.Manager; 38using OpenSim.Region.Physics.Manager;
38using OpenSim.Region.Framework; 39using OpenSim.Region.Framework;
39using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
@@ -105,6 +106,7 @@ namespace OpenSim.Tests.Common.Setup
105 { 106 {
106 Console.WriteLine("Setting up test scene {0}", name); 107 Console.WriteLine("Setting up test scene {0}", name);
107 108
109 MainServer.Instance = new BaseHttpServer(980);
108 RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1"); 110 RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1");
109 regInfo.RegionName = name; 111 regInfo.RegionName = name;
110 regInfo.RegionID = id; 112 regInfo.RegionID = id;