aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-08-10 16:55:53 +0100
committerJustin Clark-Casey (justincc)2009-08-10 16:55:53 +0100
commitda82fe040917e81bd4d9745a7bff1aa8abbcc114 (patch)
tree61769ce9cfab23b1425df0541d2fcee634e79880
parentMinor: formatting cleanup. (diff)
downloadopensim-SC_OLD-da82fe040917e81bd4d9745a7bff1aa8abbcc114.zip
opensim-SC_OLD-da82fe040917e81bd4d9745a7bff1aa8abbcc114.tar.gz
opensim-SC_OLD-da82fe040917e81bd4d9745a7bff1aa8abbcc114.tar.bz2
opensim-SC_OLD-da82fe040917e81bd4d9745a7bff1aa8abbcc114.tar.xz
* Fix test failure by setting up MainConsole.Instance in SceneSetupHelpers.SetupScene()
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs4
-rw-r--r--prebuild.xml1
2 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index a152ea6..c11691f 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -33,6 +33,7 @@ using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Console;
36using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
37using OpenSim.Framework.Servers.HttpServer; 38using OpenSim.Framework.Servers.HttpServer;
38using OpenSim.Region.Physics.Manager; 39using OpenSim.Region.Physics.Manager;
@@ -105,6 +106,9 @@ namespace OpenSim.Tests.Common.Setup
105 string name, UUID id, uint x, uint y, TestCommunicationsManager cm, bool startServices) 106 string name, UUID id, uint x, uint y, TestCommunicationsManager cm, bool startServices)
106 { 107 {
107 Console.WriteLine("Setting up test scene {0}", name); 108 Console.WriteLine("Setting up test scene {0}", name);
109
110 // We must set up a console otherwise setup of some modules may fail
111 MainConsole.Instance = new LocalConsole("TEST PROMPT");
108 112
109 MainServer.Instance = new BaseHttpServer(980); 113 MainServer.Instance = new BaseHttpServer(980);
110 RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1"); 114 RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1");
diff --git a/prebuild.xml b/prebuild.xml
index ab17fc5..fbe1a97 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3295,6 +3295,7 @@
3295 <Reference name="OpenMetaverseTypes.dll"/> 3295 <Reference name="OpenMetaverseTypes.dll"/>
3296 <Reference name="OpenSim.Framework"/> 3296 <Reference name="OpenSim.Framework"/>
3297 <Reference name="OpenSim.Framework.Communications"/> 3297 <Reference name="OpenSim.Framework.Communications"/>
3298 <Reference name="OpenSim.Framework.Console"/>
3298 <Reference name="OpenSim.Framework.Servers"/> 3299 <Reference name="OpenSim.Framework.Servers"/>
3299 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 3300 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3300 <Reference name="OpenSim.Data"/> 3301 <Reference name="OpenSim.Data"/>