From Alan Webb <awebb@linux.vnet.ibm.com>

These changes replace all direct references to the AssetCache with
IAssetCache. There is no change to functionality. Everything works as
before.

This is laying the groundwork for making it possible to register
alternative asset caching mechanisms without disrupting other parts of
OpenSim or their dependencies upon AssetCache functionality.

7 files changed, 14 insertions, 14 deletions

diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs
index 6bc4c4b..6cad7c9 100644
--- a/OpenSim/Region/ClientStack/ClientStackManager.cs
+++ b/OpenSim/Region/ClientStack/ClientStackManager.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment
         /// <returns></returns>
         public IClientNetworkServer CreateServer(
             IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port,
-            AssetCache assetCache, AgentCircuitManager authenticateClass)
+            IAssetCache assetCache, AgentCircuitManager authenticateClass)
         {    
             return CreateServer(
                 _listenIP, ref port, proxyPortOffset, allow_alternate_port, null, assetCache, authenticateClass);                                               
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Environment
         /// <returns></returns>        
         public IClientNetworkServer CreateServer(
             IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource,
-            AssetCache assetCache, AgentCircuitManager authenticateClass)
+            IAssetCache assetCache, AgentCircuitManager authenticateClass)
         {            
             if (plugin != null)
             {
diff --git a/OpenSim/Region/ClientStack/IClientNetworkServer.cs b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
index 0073389..8bd5434 100644
--- a/OpenSim/Region/ClientStack/IClientNetworkServer.cs
+++ b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.ClientStack
     {
         void Initialise(
             IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, 
-            AssetCache assetCache, AgentCircuitManager authenticateClass);
+            IAssetCache assetCache, AgentCircuitManager authenticateClass);
 
         Socket Server { get; }
         bool HandlesRegion(Location x);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 71fced9..f53174a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private int m_debugPacketLevel;
 
-        private readonly AssetCache m_assetCache;
+        private readonly IAssetCache m_assetCache;
         private int m_cachedTextureSerial;
         private Timer m_clientPingTimer;
 
@@ -429,7 +429,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// Constructor
         /// </summary>
         public LLClientView(
-            EndPoint remoteEP, IScene scene, AssetCache assetCache, LLPacketServer packServer,
+            EndPoint remoteEP, IScene scene, IAssetCache assetCache, LLPacketServer packServer,
             AuthenticateResponse sessionInfo, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP,
             ClientStackUserSettings userSettings)
         {
@@ -3748,7 +3748,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         handlerGenericMessage(sender, method, msg);
                         return true;
                     }
-                    catch(Exception e)
+                    catch (Exception e)
                     {
                         m_log.Error("[GENERICMESSAGE] " + e);
                     }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 9b71770..43a2e23 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             new Dictionary<UUID, IPriorityQueueHandle<Prio<J2KImage>>>();
 
         private LLClientView m_client;
-        private readonly AssetCache m_assetCache;
+        private readonly IAssetCache m_assetCache;
         private bool m_shuttingdown = false;
         private readonly IJ2KDecoder m_j2kDecodeModule;
 
@@ -67,7 +67,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="client">LLClientView of client</param>
         /// <param name="pAssetCache">The Asset retrieval system</param>
         /// <param name="pJ2kDecodeModule">The Jpeg2000 Decoder</param>
-        public LLImageManager(LLClientView client, AssetCache pAssetCache, IJ2KDecoder pJ2kDecodeModule)
+        public LLImageManager(LLClientView client, IAssetCache pAssetCache, IJ2KDecoder pJ2kDecodeModule)
         {
             m_client = client;
             m_assetCache = pAssetCache;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index 2b52220..a42ae04 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="proxyEP"></param>
         /// <returns></returns>
         protected virtual IClientAPI CreateNewCircuit(
-            EndPoint remoteEP, IScene scene, AssetCache assetCache,
+            EndPoint remoteEP, IScene scene, IAssetCache assetCache,
             LLPacketServer packServer, AuthenticateResponse sessionInfo,
              UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP)
         {
@@ -134,7 +134,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// true if a new circuit was created, false if a circuit with the given circuit code already existed
         /// </returns>        
         public virtual bool AddNewClient(
-            EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache,
+            EndPoint epSender, UseCircuitCodePacket useCircuit, IAssetCache assetCache,
             AuthenticateResponse sessionInfo, EndPoint proxyEP)
         {
             IClientAPI newuser;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index f53d485..bdc4490 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         protected bool Allow_Alternate_Port;
         protected IPAddress listenIP = IPAddress.Parse("0.0.0.0");
         protected IScene m_localScene;
-        protected AssetCache m_assetCache;
+        protected IAssetCache m_assetCache;
 
         /// <value>
         /// Manages authentication for agent circuits
@@ -131,7 +131,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public LLUDPServer(
             IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource, 
-            AssetCache assetCache, AgentCircuitManager authenticateClass)
+            IAssetCache assetCache, AgentCircuitManager authenticateClass)
         {
             Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, configSource, assetCache, authenticateClass);
         }
@@ -148,7 +148,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="circuitManager"></param>
         public void Initialise(
             IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource,
-            AssetCache assetCache, AgentCircuitManager circuitManager)
+            IAssetCache assetCache, AgentCircuitManager circuitManager)
         {
             ClientStackUserSettings userSettings = new ClientStackUserSettings();
             
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index dcc17a7..18d8c5c 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.ClientStack
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected AssetCache m_assetCache;
+        protected IAssetCache m_assetCache;
         protected Dictionary<EndPoint, uint> m_clientCircuits = new Dictionary<EndPoint, uint>();
         protected NetworkServersInfo m_networkServersInfo;