diff options
| author | Melanie | 2013-02-06 02:38:30 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-06 02:38:30 +0000 |
| commit | d8c27de39596e1ec18c2e239d552dcc6787f4477 (patch) | |
| tree | 800b96b1146a920faf0b258012942ad9a0341d21 /OpenSim/Tests/Common/Helpers | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Add explanation of MaptileStaticUUID setting in Regions.ini.example (diff) | |
| download | opensim-SC-d8c27de39596e1ec18c2e239d552dcc6787f4477.zip opensim-SC-d8c27de39596e1ec18c2e239d552dcc6787f4477.tar.gz opensim-SC-d8c27de39596e1ec18c2e239d552dcc6787f4477.tar.bz2 opensim-SC-d8c27de39596e1ec18c2e239d552dcc6787f4477.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Tests/Common/Helpers')
| -rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index ea3e348..dc20f13 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, false, configSource, null); | 142 | regInfo, m_acm, scs, m_simDataService, m_estateDataService, configSource, null); |
| 143 | 143 | ||
| 144 | INonSharedRegionModule godsModule = new GodsModule(); | 144 | INonSharedRegionModule godsModule = new GodsModule(); |
| 145 | godsModule.Initialise(new IniConfigSource()); | 145 | godsModule.Initialise(new IniConfigSource()); |