aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-10 00:30:51 +0000
committerMelanie Thielker2009-05-10 00:30:51 +0000
commit13b2ff83df33fda14d9a8352ed19386913f3c60f (patch)
tree1112b5545c5e454f62f417e0181238bfb15ca97c /OpenSim
parentCOmmitting the asset cache skeleton (diff)
downloadopensim-SC_OLD-13b2ff83df33fda14d9a8352ed19386913f3c60f.zip
opensim-SC_OLD-13b2ff83df33fda14d9a8352ed19386913f3c60f.tar.gz
opensim-SC_OLD-13b2ff83df33fda14d9a8352ed19386913f3c60f.tar.bz2
opensim-SC_OLD-13b2ff83df33fda14d9a8352ed19386913f3c60f.tar.xz
Small asset cache addition. Comment a debug output left in CAPS
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs6
-rw-r--r--OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs11
2 files changed, 14 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 6e005b7..d0c1925 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -365,7 +365,7 @@ namespace OpenSim.Framework.Communications.Capabilities
365 365
366 public string FetchInventoryDescendentsRequest(string request, string path, string param,OSHttpRequest httpRequest, OSHttpResponse httpResponse) 366 public string FetchInventoryDescendentsRequest(string request, string path, string param,OSHttpRequest httpRequest, OSHttpResponse httpResponse)
367 { 367 {
368 m_log.Debug("[CAPS]: FetchInventoryDescendentsRequest in region: " + m_regionName + " request is "+request); 368 // m_log.Debug("[CAPS]: FetchInventoryDescendentsRequest in region: " + m_regionName + "request is "+request);
369 369
370 // nasty temporary hack here, the linden client falsely identifies the uuid 00000000-0000-0000-0000-000000000000 as a string which breaks us 370 // nasty temporary hack here, the linden client falsely identifies the uuid 00000000-0000-0000-0000-000000000000 as a string which breaks us
371 // correctly mark it as a uuid 371 // correctly mark it as a uuid
@@ -425,8 +425,8 @@ namespace OpenSim.Framework.Communications.Capabilities
425 response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>"; 425 response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>";
426 } 426 }
427 427
428 m_log.DebugFormat("[CAPS]: Replying to CAPS fetch inventory request with following xml"); 428 //m_log.DebugFormat("[CAPS]: Replying to CAPS fetch inventory request with following xml");
429 m_log.Debug("[CAPS] "+response); 429 //m_log.Debug("[CAPS] "+response);
430 430
431 return response; 431 return response;
432 } 432 }
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index 87f3945..17caa9b 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -44,6 +44,8 @@ namespace OpenSim.Region.CoreModules.Asset
44 MethodBase.GetCurrentMethod().DeclaringType); 44 MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 private bool m_Enabled = false; 46 private bool m_Enabled = false;
47 private Dictionary<Scene, IAssetService> m_AssetService =
48 new Dictionary<Scene, IAssetService>();
47 49
48 public string Name 50 public string Name
49 { 51 {
@@ -94,6 +96,15 @@ namespace OpenSim.Region.CoreModules.Asset
94 96
95 public void RegionLoaded(Scene scene) 97 public void RegionLoaded(Scene scene)
96 { 98 {
99 if (!m_Enabled)
100 return;
101
102 m_AssetService[scene] =
103 scene.RequestModuleInterface<IAssetService>();
104
105 if (m_AssetService[scene] != null)
106 m_log.InfoFormat("[ASSET CACHE]: Enabled for region {0}",
107 scene.RegionInfo.RegionName);
97 } 108 }
98 } 109 }
99} 110}