From 8088802c218d7eb4a47018b5b3bb70e7463a03b1 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Mon, 9 Feb 2009 21:47:55 +0000
Subject: 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.

---
 OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs   | 2 +-
 OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs | 2 +-
 OpenSim/Region/Communications/Hypergrid/HGGridServices.cs             | 4 ++--
 OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs     | 2 +-
 OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Communications/Hypergrid')

diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index c4d48a9..4de4b2b 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Communications.Hypergrid
 
         public HGCommunicationsGridMode(
             NetworkServersInfo serversInfo, BaseHttpServer httpServer,
-            AssetCache assetCache, SceneManager sman, LibraryRootFolder libraryRootFolder)
+            IAssetCache assetCache, SceneManager sman, LibraryRootFolder libraryRootFolder)
             : base(serversInfo, httpServer, assetCache, false, libraryRootFolder)
         {
 
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index 804640e..39e13d1 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Communications.Hypergrid
         public HGCommunicationsStandalone(
             NetworkServersInfo serversInfo,
             BaseHttpServer httpServer,
-            AssetCache assetCache,
+            IAssetCache assetCache,
             IUserService userService,
             IUserAdminService userServiceAdmin,
             LocalInventoryService inventoryService,
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index 2ca956b..9b11a2c 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Communications.Hypergrid
         // This is key-ed on agent ID
         protected Dictionary<UUID, RegionInfo> m_knownRegions = new Dictionary<UUID, RegionInfo>();
 
-        protected AssetCache m_assetcache;
+        protected IAssetCache m_assetcache;
         protected UserProfileCacheService m_userProfileCache;
         protected SceneManager m_sceneman;
 
@@ -120,7 +120,7 @@ namespace OpenSim.Region.Communications.Hypergrid
         /// </summary>
         /// <param name="servers_info"></param>
         /// <param name="httpServe"></param>
-        public HGGridServices(NetworkServersInfo servers_info, BaseHttpServer httpServe, AssetCache asscache, SceneManager sman)
+        public HGGridServices(NetworkServersInfo servers_info, BaseHttpServer httpServe, IAssetCache asscache, SceneManager sman)
         {
             serversInfo = servers_info;
             httpServer = httpServe;
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
index b1f9f63..d1f416d 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Communications.Hypergrid
         }      
 
         public HGGridServicesGridMode(NetworkServersInfo servers_info, BaseHttpServer httpServe, 
-            AssetCache asscache, SceneManager sman, UserProfileCacheService userv)
+            IAssetCache asscache, SceneManager sman, UserProfileCacheService userv)
             : base(servers_info, httpServe, asscache, sman)
         {
             m_remoteBackend = new OGS1GridServices(servers_info, httpServe);
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
index 27a7a0e..a2453db 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.Communications.Hypergrid
         }      
 
 
-        public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, AssetCache asscache, SceneManager sman)
+        public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, IAssetCache asscache, SceneManager sman)
             : base(servers_info, httpServe, asscache, sman)
         {
             //Respond to Grid Services requests
-- 
cgit v1.1