diff options
author | Teravus Ovares (Dan Olivares) | 2010-05-04 22:13:25 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2010-05-04 22:13:25 -0400 |
commit | f005e570aa85fba4e2f82094f9d795db52895eeb (patch) | |
tree | 997f70be50c295c646172a2b4b4f9dc87b05e280 /OpenSim/Tests/Common/Setup | |
parent | Add perms check to the teleport home client command handlers. (diff) | |
download | opensim-SC-f005e570aa85fba4e2f82094f9d795db52895eeb.zip opensim-SC-f005e570aa85fba4e2f82094f9d795db52895eeb.tar.gz opensim-SC-f005e570aa85fba4e2f82094f9d795db52895eeb.tar.bz2 opensim-SC-f005e570aa85fba4e2f82094f9d795db52895eeb.tar.xz |
* This should fix the tests failing because of a MainConsole.Instance null reference
* Added a MockConsole that doesn't require a handle to System.Console
Diffstat (limited to 'OpenSim/Tests/Common/Setup')
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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); |