aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Asset
diff options
context:
space:
mode:
authorJohn Hurliman2010-04-08 15:00:01 -0700
committerJohn Hurliman2010-04-08 15:00:01 -0700
commit0f3314c04ccd07e0ff9b5be69903b0a72dd73115 (patch)
tree39fbecab8f5ae7232f625527058c7598e55dc46a /OpenSim/Region/CoreModules/Asset
parentadd nant distbin target (diff)
downloadopensim-SC-0f3314c04ccd07e0ff9b5be69903b0a72dd73115.zip
opensim-SC-0f3314c04ccd07e0ff9b5be69903b0a72dd73115.tar.gz
opensim-SC-0f3314c04ccd07e0ff9b5be69903b0a72dd73115.tar.bz2
opensim-SC-0f3314c04ccd07e0ff9b5be69903b0a72dd73115.tar.xz
Backported GetTextureModule and IAssetService.GetCached()
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset')
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 967c0a1..dd796da 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -406,6 +406,11 @@ namespace Flotsam.RegionModules.AssetCache
406 return asset; 406 return asset;
407 } 407 }
408 408
409 public AssetBase GetCached(string id)
410 {
411 return Get(id);
412 }
413
409 public void Expire(string id) 414 public void Expire(string id)
410 { 415 {
411 if (m_LogLevel >= 2) 416 if (m_LogLevel >= 2)