aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
authordiva2009-05-15 05:00:25 +0000
committerdiva2009-05-15 05:00:25 +0000
commit5e4fc6e91e5edffd1dc23af4f583d6294f394a3d (patch)
tree497076db68193be2d14fc3788c1d80c74d8c977d /OpenSim/Tests/Common
parentsome sculpted prim geometry accuracy and meshing speed improvements (diff)
downloadopensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.zip
opensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.gz
opensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.bz2
opensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.xz
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing. Known problems: * HG asset transfers are borked for now * missing texture is missing * 3 unit tests commented out for now
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs14
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 8527886..5eb8e0f 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -40,6 +40,8 @@ using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.CoreModules.Agent.Capabilities; 41using OpenSim.Region.CoreModules.Agent.Capabilities;
42using OpenSim.Region.CoreModules.Avatar.Gods; 42using OpenSim.Region.CoreModules.Avatar.Gods;
43using OpenSim.Region.CoreModules.ServiceConnectors.Asset;
44using OpenSim.Services.Interfaces;
43using OpenSim.Tests.Common.Mock; 45using OpenSim.Tests.Common.Mock;
44 46
45namespace OpenSim.Tests.Common.Setup 47namespace OpenSim.Tests.Common.Setup
@@ -122,6 +124,18 @@ namespace OpenSim.Tests.Common.Setup
122 IRegionModule godsModule = new GodsModule(); 124 IRegionModule godsModule = new GodsModule();
123 godsModule.Initialise(testScene, new IniConfigSource()); 125 godsModule.Initialise(testScene, new IniConfigSource());
124 testScene.AddModule(godsModule.Name, godsModule); 126 testScene.AddModule(godsModule.Name, godsModule);
127
128 ISharedRegionModule assetService = new LocalAssetServicesConnector();
129 IniConfigSource config = new IniConfigSource();
130 config.AddConfig("ServiceConnectors");
131 config.AddConfig("AssetService");
132 config.Configs["ServiceConnectors"].Set("AssetServices", "LocalAssetServicesConnector");
133 config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
134 config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
135 assetService.Initialise(config);
136 assetService.AddRegion(testScene);
137 assetService.RegionLoaded(testScene);
138 //testScene.RegisterModuleInterface<IAssetService>((IAssetService)assetService);
125 139
126 testScene.SetModuleInterfaces(); 140 testScene.SetModuleInterfaces();
127 141