diff options
| author | KittoFlora | 2009-11-15 22:20:51 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-11-15 22:20:51 +0100 |
| commit | ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee (patch) | |
| tree | e218f290178d98e63aa8ab6aef46c1715195c32e /OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Make GroupRootUpdate be a terse update. This method is not used by opensim (i... (diff) | |
| download | opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.zip opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.gz opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.bz2 opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs')
| -rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index eab5422..8b18d07 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
| @@ -219,7 +219,7 @@ namespace OpenSim.Tests.Common.Setup | |||
| 219 | if (real) | 219 | if (real) |
| 220 | config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService"); | 220 | config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService"); |
| 221 | else | 221 | else |
| 222 | config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestAssetService"); | 222 | config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockAssetService"); |
| 223 | config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); | 223 | config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); |
| 224 | assetService.Initialise(config); | 224 | assetService.Initialise(config); |
| 225 | assetService.AddRegion(testScene); | 225 | assetService.AddRegion(testScene); |
| @@ -238,7 +238,7 @@ namespace OpenSim.Tests.Common.Setup | |||
| 238 | if (real) | 238 | if (real) |
| 239 | config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService"); | 239 | config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService"); |
| 240 | else | 240 | else |
| 241 | config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestInventoryService"); | 241 | config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockInventoryService"); |
| 242 | config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); | 242 | config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); |
| 243 | inventoryService.Initialise(config); | 243 | inventoryService.Initialise(config); |
| 244 | inventoryService.AddRegion(testScene); | 244 | inventoryService.AddRegion(testScene); |