diff options
author | Sean Dague | 2009-02-09 21:47:55 +0000 |
---|---|---|
committer | Sean Dague | 2009-02-09 21:47:55 +0000 |
commit | 8088802c218d7eb4a47018b5b3bb70e7463a03b1 (patch) | |
tree | ac22b97c3dce09a91bae18b5840f8654813dcfc8 /OpenSim/Framework/Communications/Cache | |
parent | Thank you kindly, TLaukkan (Tommil) for a patch that: (diff) | |
download | opensim-SC_OLD-8088802c218d7eb4a47018b5b3bb70e7463a03b1.zip opensim-SC_OLD-8088802c218d7eb4a47018b5b3bb70e7463a03b1.tar.gz opensim-SC_OLD-8088802c218d7eb4a47018b5b3bb70e7463a03b1.tar.bz2 opensim-SC_OLD-8088802c218d7eb4a47018b5b3bb70e7463a03b1.tar.xz |
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.
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 2b2467c..2296e46 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -37,7 +37,7 @@ using GlynnTucker.Cache; | |||
37 | 37 | ||
38 | namespace OpenSim.Framework.Communications.Cache | 38 | namespace OpenSim.Framework.Communications.Cache |
39 | { | 39 | { |
40 | public delegate void AssetRequestCallback(UUID assetID, AssetBase asset); | 40 | // public delegate void AssetRequestCallback(UUID assetID, AssetBase asset); |
41 | 41 | ||
42 | /// <summary> | 42 | /// <summary> |
43 | /// Manages local cache of assets and their sending to viewers. | 43 | /// Manages local cache of assets and their sending to viewers. |
@@ -47,7 +47,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
47 | /// synchronously or async and passes the data back to the requester. The second mechanism fetches assets and | 47 | /// synchronously or async and passes the data back to the requester. The second mechanism fetches assets and |
48 | /// sends packetised data directly back to the client. The only point where they meet is AssetReceived() and | 48 | /// sends packetised data directly back to the client. The only point where they meet is AssetReceived() and |
49 | /// AssetNotFound(), which means they do share the same asset and texture caches.I agr | 49 | /// AssetNotFound(), which means they do share the same asset and texture caches.I agr |
50 | public class AssetCache : IAssetReceiver | 50 | |
51 | public class AssetCache : IAssetCache, IAssetReceiver | ||
51 | { | 52 | { |
52 | protected ICache m_memcache = new SimpleMemoryCache(); | 53 | protected ICache m_memcache = new SimpleMemoryCache(); |
53 | 54 | ||
@@ -148,7 +149,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
148 | /// Process the asset queue which holds data which is packeted up and sent | 149 | /// Process the asset queue which holds data which is packeted up and sent |
149 | /// directly back to the client. | 150 | /// directly back to the client. |
150 | /// </summary> | 151 | /// </summary> |
151 | public void RunAssetManager() | 152 | private void RunAssetManager() |
152 | { | 153 | { |
153 | while (true) | 154 | while (true) |
154 | { | 155 | { |