From 5e4fc6e91e5edffd1dc23af4f583d6294f394a3d Mon Sep 17 00:00:00 2001 From: diva Date: Fri, 15 May 2009 05:00:25 +0000 Subject: 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 --- OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/CoreModules/Asset') diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs index c7f8c31..bc6a239 100644 --- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs @@ -56,10 +56,14 @@ namespace OpenSim.Region.CoreModules.Asset public void Initialise(IConfigSource source) { - IConfig moduleConfig = source.Configs["Modules"]; + IConfig moduleConfig = source.Configs["ServiceConnectors"]; + m_log.DebugFormat("[XXX] moduleConfig null? {0}", ((moduleConfig == null) ? "yes" : "no")); + if (moduleConfig != null) { string name = moduleConfig.GetString("AssetCaching", "CoreAssetCache"); + m_log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name); + if (name == Name) { IConfig assetConfig = source.Configs["AssetCache"]; -- cgit v1.1