aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Asset
diff options
context:
space:
mode:
authordiva2009-05-15 05:00:25 +0000
committerdiva2009-05-15 05:00:25 +0000
commit5e4fc6e91e5edffd1dc23af4f583d6294f394a3d (patch)
tree497076db68193be2d14fc3788c1d80c74d8c977d /OpenSim/Region/CoreModules/Asset
parentsome sculpted prim geometry accuracy and meshing speed improvements (diff)
downloadopensim-SC-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.zip
opensim-SC-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.gz
opensim-SC-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.bz2
opensim-SC-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/Region/CoreModules/Asset')
-rw-r--r--OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs6
1 files changed, 5 insertions, 1 deletions
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
56 56
57 public void Initialise(IConfigSource source) 57 public void Initialise(IConfigSource source)
58 { 58 {
59 IConfig moduleConfig = source.Configs["Modules"]; 59 IConfig moduleConfig = source.Configs["ServiceConnectors"];
60 m_log.DebugFormat("[XXX] moduleConfig null? {0}", ((moduleConfig == null) ? "yes" : "no"));
61
60 if (moduleConfig != null) 62 if (moduleConfig != null)
61 { 63 {
62 string name = moduleConfig.GetString("AssetCaching", "CoreAssetCache"); 64 string name = moduleConfig.GetString("AssetCaching", "CoreAssetCache");
65 m_log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name);
66
63 if (name == Name) 67 if (name == Name)
64 { 68 {
65 IConfig assetConfig = source.Configs["AssetCache"]; 69 IConfig assetConfig = source.Configs["AssetCache"];