10 files changed, 18 insertions, 45 deletions

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 4d1c606..6a66116 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -190,11 +190,11 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
         {    
             HGGridServicesStandalone gridService 
                 = new HGGridServicesStandalone(
-                    m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager);                         
+                    m_openSim.NetServersInfo, m_httpServer, m_openSim.SceneManager);                         
 
             m_commsManager 
                 = new HGCommunicationsStandalone(
-                    m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache,
+                    m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, 
                     gridService, 
                     libraryRootFolder, false);                        
             
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 629fed6..6ea04cf 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -416,14 +416,7 @@ namespace OpenSim
 
         private void HandleClearAssets(string module, string[] args)
         {
-            if (AssetCache != null)
-            {
-                AssetCache.Clear();
-            }
-            else
-            {
-                m_log.Info("Asset cache is not configured.");
-            }
+            m_log.Info("Not implemented.");
         }
 
         private void HandleForceUpdate(string module, string[] args)
@@ -815,14 +808,7 @@ namespace OpenSim
             switch (showParams[0])
             {
                 case "assets":
-                    if (AssetCache != null)
-                    {
-                        AssetCache.ShowState();
-                    }
-                    else
-                    {
-                        m_log.Info("Asset cache is not configured.");
-                    }
+                    m_log.Info("Not implemented.");
                     break;
 
                 case "users":
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index d8f786b..3d58839 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -488,7 +488,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// Constructor
         /// </summary>
         public LLClientView(
-            EndPoint remoteEP, IScene scene, IAssetCache assetCache, LLPacketServer packServer,
+            EndPoint remoteEP, IScene scene, LLPacketServer packServer,
             AuthenticateResponse sessionInfo, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP,
             ClientStackUserSettings userSettings)
         {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index b154144..56219d1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -87,13 +87,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="proxyEP"></param>
         /// <returns></returns>
         protected virtual IClientAPI CreateNewCircuit(
-            EndPoint remoteEP, IScene scene, IAssetCache assetCache,
+            EndPoint remoteEP, IScene scene, 
             LLPacketServer packServer, AuthenticateResponse sessionInfo,
              UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP)
         {
             return
                 new LLClientView(
-                     remoteEP, scene, assetCache, packServer, sessionInfo, agentId, sessionId, circuitCode, proxyEP,
+                     remoteEP, scene, packServer, sessionInfo, agentId, sessionId, circuitCode, proxyEP,
                      m_userSettings);
         }
 
@@ -131,7 +131,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, IAssetCache assetCache,
+            EndPoint epSender, UseCircuitCodePacket useCircuit, 
             AuthenticateResponse sessionInfo, EndPoint proxyEP)
         {
             IClientAPI newuser;
@@ -150,7 +150,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             
             newuser 
                 = CreateNewCircuit(
-                    epSender, m_scene, assetCache, this, sessionInfo, agentId, sessionId, circuitCode, proxyEP);
+                    epSender, m_scene, this, sessionInfo, agentId, sessionId, circuitCode, proxyEP);
 
             m_scene.ClientManager.Add(circuitCode, newuser);
 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 54434f1..5184e35 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -75,7 +75,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         protected bool Allow_Alternate_Port;
         protected IPAddress listenIP = IPAddress.Parse("0.0.0.0");
         protected IScene m_localScene;
-        protected IAssetCache m_assetCache;
         protected int m_clientSocketReceiveBuffer = 0;
 
         /// <value>
@@ -131,7 +130,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public LLUDPServer(
             IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource, 
-            IAssetCache assetCache, AgentCircuitManager authenticateClass)
+            AgentCircuitManager authenticateClass)
         {
             Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, configSource, authenticateClass);
         }
@@ -451,7 +450,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         proxyCircuits[useCircuit.CircuitCode.Code] = epProxy;
                     }
                     
-                    m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy);
+                    m_packetServer.AddNewClient(epSender, useCircuit, sessionInfo, epProxy);
                                     
                     //m_log.DebugFormat(
                     //    "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}", 
@@ -629,7 +628,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
             }
 
-            m_packetServer.AddNewClient(userEP, useCircuit, m_assetCache, sessionInfo, proxyEP);
+            m_packetServer.AddNewClient(userEP, useCircuit, sessionInfo, proxyEP);
         }
     }
 }
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 2fbbbe2..a266a40 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -72,15 +72,7 @@ namespace OpenSim.Region.ClientStack
             get { return m_sceneManager; }
         }
         protected SceneManager m_sceneManager = new SceneManager();
-
-        protected IAssetCache m_assetCache;
-
-        public IAssetCache AssetCache
-        {
-            get { return m_assetCache; }
-            set { m_assetCache = value; }
-        }
-        
+       
         protected abstract void Initialize();
         
         /// <summary>
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index 3ea987c..1bfc736 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -44,7 +44,6 @@ namespace OpenSim.Region.Communications.Hypergrid
             ConfigSettings configSettings,                          
             NetworkServersInfo serversInfo,
             BaseHttpServer httpServer,
-            IAssetCache assetCache,
             HGGridServices gridService, 
             LibraryRootFolder libraryRootFolder, 
             bool dumpAssetsToFile)
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
index 828d0d9..94cfc49 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Communications.Hypergrid
         }      
 
 
-        public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, IAssetCache asscache, SceneManager sman)
+        public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, SceneManager sman)
             : base(servers_info, sman)
         {
             //Respond to Grid Services requests
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index 8cf039d..5208e7a 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -35,6 +35,7 @@ using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Serialization;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
@@ -60,9 +61,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <summary>
         /// Cache to which dearchived assets will be added
         /// </summary>
-        protected IAssetCache m_cache;
+        protected IAssetService m_cache;
 
-        public AssetsDearchiver(IAssetCache cache)
+        public AssetsDearchiver(IAssetService cache)
         {
             m_cache = cache;
         }
@@ -162,7 +163,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 asset.Type = metadata.AssetType;
                 asset.Data = data;
 
-                m_cache.AddAsset(asset);
+                m_cache.Store(asset);
             }
             else
             {
diff --git a/bin/OpenSim.addin.xml b/bin/OpenSim.addin.xml
index 00d41cb..a42ba25 100644
--- a/bin/OpenSim.addin.xml
+++ b/bin/OpenSim.addin.xml
@@ -10,10 +10,6 @@
         <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.IApplicationPlugin"/>
     </ExtensionPoint>
 
-    <ExtensionPoint path="/OpenSim/AssetCache" name="Region Asset Cache Plugin-point" >
-        <ExtensionNode name="Cache" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IAssetCache"/>
-    </ExtensionPoint>
-
     <ExtensionPoint path="/OpenSim/WindModule" name="Wind Module Plugins for wind models">
                 <ExtensionNode name="WindModel" type="Mono.Addins.TypeExtensionNode" objectType="OpenSim.Region.Framework.Interfaces.IWindModelPlugin"/>
     </ExtensionPoint>