aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Console/MockConsole.cs32
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs4
2 files changed, 34 insertions, 2 deletions
diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs
new file mode 100644
index 0000000..57c56f1
--- /dev/null
+++ b/OpenSim/Framework/Console/MockConsole.cs
@@ -0,0 +1,32 @@
1using System;
2using System.Threading;
3using System.Collections.Generic;
4using System.Text;
5
6namespace OpenSim.Framework.Console
7{
8 public class MockConsole : CommandConsole
9 {
10 public MockConsole(string defaultPrompt) : base(defaultPrompt)
11 {
12 }
13 public override void Output(string text)
14 {
15 }
16 public override void Output(string text, string level)
17 {
18 }
19
20 public override string ReadLine(string p, bool isCommand, bool e)
21 {
22 //Thread.CurrentThread.Join(1000);
23 return string.Empty;
24 }
25 public override void UnlockOutput()
26 {
27 }
28 public override void LockOutput()
29 {
30 }
31 }
32}
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 864e2aa..ef8ea50 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Tests.Common.Setup
142 //{ 142 //{
143 // System.Console.WriteLine("Starting a brand new scene"); 143 // System.Console.WriteLine("Starting a brand new scene");
144 // newScene = true; 144 // newScene = true;
145 // MainConsole.Instance = new LocalConsole("TEST PROMPT"); 145 MainConsole.Instance = new MockConsole("TEST PROMPT");
146 // MainServer.Instance = new BaseHttpServer(980); 146 // MainServer.Instance = new BaseHttpServer(980);
147 // commsManager = cm; 147 // commsManager = cm;
148 //} 148 //}
@@ -204,7 +204,7 @@ namespace OpenSim.Tests.Common.Setup
204 m_inventoryService.PostInitialise(); 204 m_inventoryService.PostInitialise();
205 m_assetService.PostInitialise(); 205 m_assetService.PostInitialise();
206 m_userAccountService.PostInitialise(); 206 m_userAccountService.PostInitialise();
207 207 testScene.RegionInfo.EstateSettings.EstateOwner = UUID.Random();
208 testScene.SetModuleInterfaces(); 208 testScene.SetModuleInterfaces();
209 209
210 testScene.LandChannel = new TestLandChannel(testScene); 210 testScene.LandChannel = new TestLandChannel(testScene);