OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small asset cache addition. Comment a debug output left in CAPS

0.6.5-rc1
Melanie Thielker 2009-05-10 00:30:51 +00:00
parent 89d921c3b2
commit 13b2ff83df
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@ -365,7 +365,7 @@ namespace OpenSim.Framework.Communications.Capabilities
public string FetchInventoryDescendentsRequest(string request, string path, string param,OSHttpRequest httpRequest, OSHttpResponse httpResponse) 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 // 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 // correctly mark it as a uuid
@ -425,8 +425,8 @@ namespace OpenSim.Framework.Communications.Capabilities
response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>"; response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>";
} }
m_log.DebugFormat("[CAPS]: Replying to CAPS fetch inventory request with following xml"); //m_log.DebugFormat("[CAPS]: Replying to CAPS fetch inventory request with following xml");
m_log.Debug("[CAPS] "+response); //m_log.Debug("[CAPS] "+response);
return response; return response;
} }

11
OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
View File

@ -44,6 +44,8 @@ namespace OpenSim.Region.CoreModules.Asset
MethodBase.GetCurrentMethod().DeclaringType); MethodBase.GetCurrentMethod().DeclaringType);
private bool m_Enabled = false; private bool m_Enabled = false;
private Dictionary<Scene, IAssetService> m_AssetService =
new Dictionary<Scene, IAssetService>();
public string Name public string Name
{ {
@ -94,6 +96,15 @@ namespace OpenSim.Region.CoreModules.Asset
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
{ {
if (!m_Enabled)
return;
m_AssetService[scene] =
scene.RequestModuleInterface<IAssetService>();
if (m_AssetService[scene] != null)
m_log.InfoFormat("[ASSET CACHE]: Enabled for region {0}",
scene.RegionInfo.RegionName);
} }
} }
} }