aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-06 15:09:52 +0000
committerJustin Clarke Casey2009-01-06 15:09:52 +0000
commitb6ee2f15bacda2a2c22785923b1e41639db5a6db (patch)
tree5608581d1cd1b2f37c149d60e79d81da9cc705ca /OpenSim/Tests
parent* refactor: call AddHttpHandler() directly via CommsManager (diff)
downloadopensim-SC_OLD-b6ee2f15bacda2a2c22785923b1e41639db5a6db.zip
opensim-SC_OLD-b6ee2f15bacda2a2c22785923b1e41639db5a6db.tar.gz
opensim-SC_OLD-b6ee2f15bacda2a2c22785923b1e41639db5a6db.tar.bz2
opensim-SC_OLD-b6ee2f15bacda2a2c22785923b1e41639db5a6db.tar.xz
* refactor: Remove the need to separately pass in the http listener to the scene - this is always available via CommsManager
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r--OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs4
-rw-r--r--OpenSim/Tests/Common/Mock/TestScene.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index c234429..738bc15 100644
--- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Tests.Common.Mock
53 } 53 }
54 54
55 public TestCommunicationsManager(NetworkServersInfo serversInfo) 55 public TestCommunicationsManager(NetworkServersInfo serversInfo)
56 : base(serversInfo, null, null, false, null) 56 : base(serversInfo, new BaseHttpServer(666), null, false, null)
57 { 57 {
58 m_userDataPlugin = new TestUserDataPlugin(); 58 m_userDataPlugin = new TestUserDataPlugin();
59 m_inventoryDataPlugin = new TestInventoryDataPlugin(); 59 m_inventoryDataPlugin = new TestInventoryDataPlugin();
60 60
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 6b176a1..04b3e74 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -40,10 +40,10 @@ namespace OpenSim.Tests.Common.Mock
40 public TestScene( 40 public TestScene(
41 RegionInfo regInfo, AgentCircuitManager authen, 41 RegionInfo regInfo, AgentCircuitManager authen,
42 CommunicationsManager commsMan, SceneCommunicationService sceneGridService, 42 CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
43 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, 43 AssetCache assetCach, StorageManager storeManager,
44 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, 44 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
45 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 45 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
46 : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, httpServer, moduleLoader, 46 : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, moduleLoader,
47 dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) 47 dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion)
48 { 48 {
49 } 49 }