diff options
| author | Melanie | 2010-01-26 14:53:14 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-26 14:53:14 +0000 |
| commit | b80ea002654bd0ab232aee2b0f842be18b8d4edc (patch) | |
| tree | 35971637efd7ec9cbfaee88bc5ea56edffddfc1b /OpenSim/Tests | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Replace dome tabs with spaces (diff) | |
| download | opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.zip opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.gz opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.bz2 opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index b13e8dd..20f2bca 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
| @@ -161,10 +161,11 @@ namespace OpenSim.Tests.Common.Setup | |||
| 161 | capsModule.Initialise(new IniConfigSource()); | 161 | capsModule.Initialise(new IniConfigSource()); |
| 162 | testScene.AddRegionModule(capsModule.Name, capsModule); | 162 | testScene.AddRegionModule(capsModule.Name, capsModule); |
| 163 | capsModule.AddRegion(testScene); | 163 | capsModule.AddRegion(testScene); |
| 164 | 164 | ||
| 165 | IRegionModule godsModule = new GodsModule(); | 165 | INonSharedRegionModule godsModule = new GodsModule(); |
| 166 | godsModule.Initialise(testScene, new IniConfigSource()); | 166 | godsModule.Initialise(new IniConfigSource()); |
| 167 | testScene.AddModule(godsModule.Name, godsModule); | 167 | testScene.AddRegionModule(godsModule.Name, godsModule); |
| 168 | godsModule.AddRegion(testScene); | ||
| 168 | realServices = realServices.ToLower(); | 169 | realServices = realServices.ToLower(); |
| 169 | // IConfigSource config = new IniConfigSource(); | 170 | // IConfigSource config = new IniConfigSource(); |
| 170 | 171 | ||