From da82fe040917e81bd4d9745a7bff1aa8abbcc114 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 10 Aug 2009 16:55:53 +0100
Subject: * Fix test failure by setting up MainConsole.Instance in
 SceneSetupHelpers.SetupScene()

---
 OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 4 ++++
 prebuild.xml                                    | 1 +
 2 files changed, 5 insertions(+)

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;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Physics.Manager;
@@ -105,6 +106,9 @@ namespace OpenSim.Tests.Common.Setup
             string name, UUID id, uint x, uint y, TestCommunicationsManager cm, bool startServices)
         {
             Console.WriteLine("Setting up test scene {0}", name);
+
+            // We must set up a console otherwise setup of some modules may fail
+            MainConsole.Instance = new LocalConsole("TEST PROMPT");
             
             MainServer.Instance = new BaseHttpServer(980);
             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 @@
       <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Data"/>
-- 
cgit v1.1