diff options
| author | Justin Clark-Casey (justincc) | 2011-03-09 01:21:31 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-03-09 01:21:31 +0000 |
| commit | 8a2360bf815d4d78fcff34a69dec24782494bd2e (patch) | |
| tree | 51c8413aa9263831330273dce964421bc0dd8fb5 /OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |
| parent | Make -m shortcut option for --merge on load iar specific. Correct some log m... (diff) | |
| download | opensim-SC_OLD-8a2360bf815d4d78fcff34a69dec24782494bd2e.zip opensim-SC_OLD-8a2360bf815d4d78fcff34a69dec24782494bd2e.tar.gz opensim-SC_OLD-8a2360bf815d4d78fcff34a69dec24782494bd2e.tar.bz2 opensim-SC_OLD-8a2360bf815d4d78fcff34a69dec24782494bd2e.tar.xz | |
Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
Diffstat (limited to 'OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs')
| -rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 5be70bc..08cc7c5 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
| @@ -304,12 +304,12 @@ namespace OpenSim.Tests.Common.Setup | |||
| 304 | config.Configs["UserAccountService"].Set( | 304 | config.Configs["UserAccountService"].Set( |
| 305 | "LocalServiceModule", "OpenSim.Services.UserAccountService.dll:UserAccountService"); | 305 | "LocalServiceModule", "OpenSim.Services.UserAccountService.dll:UserAccountService"); |
| 306 | 306 | ||
| 307 | if (m_userAccountService == null) | 307 | // if (m_userAccountService == null) |
| 308 | { | 308 | // { |
| 309 | ISharedRegionModule userAccountService = new LocalUserAccountServicesConnector(); | 309 | ISharedRegionModule userAccountService = new LocalUserAccountServicesConnector(); |
| 310 | userAccountService.Initialise(config); | 310 | userAccountService.Initialise(config); |
| 311 | m_userAccountService = userAccountService; | 311 | m_userAccountService = userAccountService; |
| 312 | } | 312 | // } |
| 313 | 313 | ||
| 314 | m_userAccountService.AddRegion(testScene); | 314 | m_userAccountService.AddRegion(testScene); |
| 315 | m_userAccountService.RegionLoaded(testScene); | 315 | m_userAccountService.RegionLoaded(testScene); |