Add some asset cache plumbing. Change the generic cache from UUID to string

keys to allow caching the new crop of URI identified objects.

2 files changed, 42 insertions, 0 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
index 24ac8be..0a0f634 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
@@ -28,6 +28,7 @@
 using log4net;
 using Nini.Config;
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using OpenSim.Servers.Base;
 using OpenSim.Region.Framework.Interfaces;
@@ -42,6 +43,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
+        private Dictionary<Scene, IImprovedAssetCache> m_AssetCache =
+                new Dictionary<Scene, IImprovedAssetCache>();
+
         private IAssetService m_AssetService;
 
         private bool m_Enabled = false;
@@ -109,10 +113,29 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
 
         public void RemoveRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
+            m_AssetCache.Remove(scene);
         }
 
         public void RegionLoaded(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
+            m_AssetCache[scene] =
+                    scene.RequestModuleInterface<IImprovedAssetCache>();
+
+            m_log.InfoFormat("[ASSET CONNECTOR]: Enabled local assets for region {0}", scene.RegionInfo.RegionName);
+
+            m_AssetCache[scene] =
+                    scene.RequestModuleInterface<IImprovedAssetCache>();
+            
+            if (m_AssetCache[scene] != null)
+            {
+                m_log.InfoFormat("[ASSET CONNECTOR]: Enabled asset caching for region {0}", scene.RegionInfo.RegionName);
+            }
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
index 2cc2962..835678d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
@@ -27,6 +27,7 @@
 
 using log4net;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using Nini.Config;
@@ -48,6 +49,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
 
         private bool m_Enabled = false;
         private string m_ServerURI = String.Empty;
+        private Dictionary<Scene, IImprovedAssetCache> m_AssetCache =
+                new Dictionary<Scene, IImprovedAssetCache>();
 
         public string Name
         {
@@ -103,10 +106,26 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
 
         public void RemoveRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
+            m_AssetCache.Remove(scene);
         }
 
         public void RegionLoaded(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
+            m_AssetCache[scene] =
+                    scene.RequestModuleInterface<IImprovedAssetCache>();
+
+            m_log.InfoFormat("[ASSET CONNECTOR]: Enabled remote assets for region {0}", scene.RegionInfo.RegionName);
+
+            if (m_AssetCache[scene] != null)
+            {
+                m_log.InfoFormat("[ASSET CONNECTOR]: Enabled asset caching for region {0}", scene.RegionInfo.RegionName);
+            }
         }
 
         public AssetBase Get(string id)