diff options
| author | Melanie | 2010-04-13 04:36:08 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-13 04:36:08 +0100 |
| commit | 9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f (patch) | |
| tree | 0b57576deba41ef22c8fc0b29e6f2b92557fe3b0 /OpenSim/Region/CoreModules/Asset | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Merge branch '0.6.9-post-fixes' into careminster (diff) | |
| download | opensim-SC_OLD-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.zip opensim-SC_OLD-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.tar.gz opensim-SC_OLD-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.tar.bz2 opensim-SC_OLD-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.tar.xz | |
Merge branch 'careminster' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 37cdaae..9eaa758 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) |