diff options
Diffstat (limited to 'OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs')
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 97d4ace..484a97d 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -132,7 +132,7 @@ namespace OpenSim.Tests.Common.Setup | |||
132 | testScene.AddModule(godsModule.Name, godsModule); | 132 | testScene.AddModule(godsModule.Name, godsModule); |
133 | realServices = realServices.ToLower(); | 133 | realServices = realServices.ToLower(); |
134 | 134 | ||
135 | LocalAssetServicesConnector assetService = StartAssetService(testScene, realServices.Contains("asset")); | 135 | LocalAssetServicesConnector assetService = StartAssetService(testScene); |
136 | 136 | ||
137 | // For now, always started a 'real' authentication service | 137 | // For now, always started a 'real' authentication service |
138 | StartAuthenticationService(testScene, true); | 138 | StartAuthenticationService(testScene, true); |
@@ -164,19 +164,15 @@ namespace OpenSim.Tests.Common.Setup | |||
164 | return testScene; | 164 | return testScene; |
165 | } | 165 | } |
166 | 166 | ||
167 | private static LocalAssetServicesConnector StartAssetService(Scene testScene, bool real) | 167 | private static LocalAssetServicesConnector StartAssetService(Scene testScene) |
168 | { | 168 | { |
169 | LocalAssetServicesConnector assetService = new LocalAssetServicesConnector(); | 169 | LocalAssetServicesConnector assetService = new LocalAssetServicesConnector(); |
170 | IConfigSource config = new IniConfigSource(); | 170 | IConfigSource config = new IniConfigSource(); |
171 | config.AddConfig("Modules"); | ||
172 | config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector"); | ||
173 | 171 | ||
172 | config.AddConfig("Modules"); | ||
173 | config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector"); | ||
174 | config.AddConfig("AssetService"); | 174 | config.AddConfig("AssetService"); |
175 | if (real) | 175 | config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService"); |
176 | config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService"); | ||
177 | else | ||
178 | config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockAssetService"); | ||
179 | |||
180 | config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); | 176 | config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); |
181 | 177 | ||
182 | assetService.Initialise(config); | 178 | assetService.Initialise(config); |