diff options
| author | Melanie | 2011-10-25 02:14:39 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 02:14:39 +0100 |
| commit | 353f0c0e03499453dbeb2e39a85fcc99788fedf2 (patch) | |
| tree | 29fd038531f3b60b8d034edf8b4a2808f78cb70d /OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |
| parent | Merge (diff) | |
| parent | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t... (diff) | |
| download | opensim-SC-353f0c0e03499453dbeb2e39a85fcc99788fedf2.zip opensim-SC-353f0c0e03499453dbeb2e39a85fcc99788fedf2.tar.gz opensim-SC-353f0c0e03499453dbeb2e39a85fcc99788fedf2.tar.bz2 opensim-SC-353f0c0e03499453dbeb2e39a85fcc99788fedf2.tar.xz | |
Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/SceneHelpers.cs')
| -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 c64270f..d358ae8 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
| @@ -108,7 +108,7 @@ namespace OpenSim.Tests.Common | |||
| 108 | IConfigSource configSource = new IniConfigSource(); | 108 | IConfigSource configSource = new IniConfigSource(); |
| 109 | 109 | ||
| 110 | TestScene testScene = new TestScene( | 110 | TestScene testScene = new TestScene( |
| 111 | regInfo, acm, scs, simDataService, estateDataService, null, false, false, configSource, null); | 111 | regInfo, acm, scs, simDataService, estateDataService, null, false, configSource, null); |
| 112 | 112 | ||
| 113 | IRegionModule godsModule = new GodsModule(); | 113 | IRegionModule godsModule = new GodsModule(); |
| 114 | godsModule.Initialise(testScene, new IniConfigSource()); | 114 | godsModule.Initialise(testScene, new IniConfigSource()); |