diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 6e005b7509..d0c1925bb5 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs @@ -365,7 +365,7 @@ namespace OpenSim.Framework.Communications.Capabilities public string FetchInventoryDescendentsRequest(string request, string path, string param,OSHttpRequest httpRequest, OSHttpResponse httpResponse) { - m_log.Debug("[CAPS]: FetchInventoryDescendentsRequest in region: " + m_regionName + " request is "+request); + // m_log.Debug("[CAPS]: FetchInventoryDescendentsRequest in region: " + m_regionName + "request is "+request); // nasty temporary hack here, the linden client falsely identifies the uuid 00000000-0000-0000-0000-000000000000 as a string which breaks us // correctly mark it as a uuid @@ -425,8 +425,8 @@ namespace OpenSim.Framework.Communications.Capabilities response = "folders" + response + ""; } - m_log.DebugFormat("[CAPS]: Replying to CAPS fetch inventory request with following xml"); - m_log.Debug("[CAPS] "+response); + //m_log.DebugFormat("[CAPS]: Replying to CAPS fetch inventory request with following xml"); + //m_log.Debug("[CAPS] "+response); return response; } diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs index 87f39456a0..17caa9b08b 100644 --- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs @@ -44,6 +44,8 @@ namespace OpenSim.Region.CoreModules.Asset MethodBase.GetCurrentMethod().DeclaringType); private bool m_Enabled = false; + private Dictionary m_AssetService = + new Dictionary(); public string Name { @@ -94,6 +96,15 @@ namespace OpenSim.Region.CoreModules.Asset public void RegionLoaded(Scene scene) { + if (!m_Enabled) + return; + + m_AssetService[scene] = + scene.RequestModuleInterface(); + + if (m_AssetService[scene] != null) + m_log.InfoFormat("[ASSET CACHE]: Enabled for region {0}", + scene.RegionInfo.RegionName); } } }