diff options
| author | Melanie | 2010-05-05 22:50:11 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-05 22:50:11 +0100 |
| commit | 7e0d5b866519a303490ee4c30b33c7598d99bbb1 (patch) | |
| tree | ebe6627b312fb98e813ecc0d4adb98bf4fb36334 /OpenSim/Tests/Common | |
| parent | Plumb Viewer version into ScenePresence for initial login. It's still not (diff) | |
| parent | Stab a test fail (diff) | |
| download | opensim-SC_OLD-7e0d5b866519a303490ee4c30b33c7598d99bbb1.zip opensim-SC_OLD-7e0d5b866519a303490ee4c30b33c7598d99bbb1.tar.gz opensim-SC_OLD-7e0d5b866519a303490ee4c30b33c7598d99bbb1.tar.bz2 opensim-SC_OLD-7e0d5b866519a303490ee4c30b33c7598d99bbb1.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -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); |