diff options
author | Melanie | 2012-11-12 22:50:28 +0000 |
---|---|---|
committer | Melanie | 2012-11-12 22:50:28 +0000 |
commit | 8c130bcaf5a60fa042d8df38ba1d1e1cb328d768 (patch) | |
tree | c96ae7dcf06cf6f6b4efba25bb0a37e55c053fce /OpenSim/Tests/Common | |
parent | Remove IRegionModule support from the test setup helper (diff) | |
download | opensim-SC_OLD-8c130bcaf5a60fa042d8df38ba1d1e1cb328d768.zip opensim-SC_OLD-8c130bcaf5a60fa042d8df38ba1d1e1cb328d768.tar.gz opensim-SC_OLD-8c130bcaf5a60fa042d8df38ba1d1e1cb328d768.tar.bz2 opensim-SC_OLD-8c130bcaf5a60fa042d8df38ba1d1e1cb328d768.tar.xz |
Remove the old style module loader and all references to it
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestScene.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index c424439..939fc33 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -139,7 +139,7 @@ namespace OpenSim.Tests.Common | |||
139 | SceneCommunicationService scs = new SceneCommunicationService(); | 139 | SceneCommunicationService scs = new SceneCommunicationService(); |
140 | 140 | ||
141 | TestScene testScene = new TestScene( | 141 | TestScene testScene = new TestScene( |
142 | regInfo, m_acm, scs, m_simDataService, m_estateDataService, null, false, configSource, null); | 142 | regInfo, m_acm, scs, m_simDataService, m_estateDataService, false, configSource, null); |
143 | 143 | ||
144 | INonSharedRegionModule godsModule = new GodsModule(); | 144 | INonSharedRegionModule godsModule = new GodsModule(); |
145 | godsModule.Initialise(new IniConfigSource()); | 145 | godsModule.Initialise(new IniConfigSource()); |
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index eea68c3..d4b5648 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
@@ -41,9 +41,9 @@ namespace OpenSim.Tests.Common.Mock | |||
41 | public TestScene( | 41 | public TestScene( |
42 | RegionInfo regInfo, AgentCircuitManager authen, | 42 | RegionInfo regInfo, AgentCircuitManager authen, |
43 | SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService, | 43 | SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService, |
44 | ModuleLoader moduleLoader, bool dumpAssetsToFile, | 44 | bool dumpAssetsToFile, |
45 | IConfigSource config, string simulatorVersion) | 45 | IConfigSource config, string simulatorVersion) |
46 | : base(regInfo, authen, sceneGridService, simDataService, estateDataService, moduleLoader, | 46 | : base(regInfo, authen, sceneGridService, simDataService, estateDataService, |
47 | dumpAssetsToFile, config, simulatorVersion) | 47 | dumpAssetsToFile, config, simulatorVersion) |
48 | { | 48 | { |
49 | } | 49 | } |
@@ -73,4 +73,4 @@ namespace OpenSim.Tests.Common.Mock | |||
73 | get { return m_asyncSceneObjectDeleter; } | 73 | get { return m_asyncSceneObjectDeleter; } |
74 | } | 74 | } |
75 | } | 75 | } |
76 | } \ No newline at end of file | 76 | } |