aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-18 17:46:14 +0000
committerJustin Clarke Casey2009-05-18 17:46:14 +0000
commitad7214620f43666aba7a48c4777ee24dbd664b86 (patch)
tree7c33b604c660a1f8e25800e1d4c2b83903db8c90 /OpenSim/Tests/Common
parentFrom: Chris Yeoh <yeohc@au1.ibm.com> (diff)
downloadopensim-SC_OLD-ad7214620f43666aba7a48c4777ee24dbd664b86.zip
opensim-SC_OLD-ad7214620f43666aba7a48c4777ee24dbd664b86.tar.gz
opensim-SC_OLD-ad7214620f43666aba7a48c4777ee24dbd664b86.tar.bz2
opensim-SC_OLD-ad7214620f43666aba7a48c4777ee24dbd664b86.tar.xz
* Re-enable save oar test by loading asset data plugins from test mock class
* Actually spit out the exception caught by the plugin loader - not much point having plugins throw exceptions if we are just going to ignore them
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 258c444..b64b840 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -131,11 +131,11 @@ namespace OpenSim.Tests.Common.Setup
131 config.AddConfig("AssetService"); 131 config.AddConfig("AssetService");
132 config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector"); 132 config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
133 config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService"); 133 config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
134 config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Data.Null.dll"); 134 config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
135 assetService.Initialise(config); 135 assetService.Initialise(config);
136 assetService.AddRegion(testScene); 136 assetService.AddRegion(testScene);
137 assetService.RegionLoaded(testScene); 137 assetService.RegionLoaded(testScene);
138 //testScene.RegisterModuleInterface<IAssetService>((IAssetService)assetService); 138 testScene.AddRegionModule(assetService.Name, assetService);
139 139
140 testScene.SetModuleInterfaces(); 140 testScene.SetModuleInterfaces();
141 141