diff options
| author | Melanie | 2010-04-13 04:13:26 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-13 04:13:26 +0100 |
| commit | a1c4585a392955bb80452da94002414ab0c6a269 (patch) | |
| tree | d42f39aa7f00289888a305e38b0cab1fbc1bab65 /OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |
| parent | Fixed LINEAR_MOTOR Z drive, Mantis #30 (diff) | |
| parent | Changed the GetTextureModule backport to work with the 0.6.9 codebase (diff) | |
| download | opensim-SC-a1c4585a392955bb80452da94002414ab0c6a269.zip opensim-SC-a1c4585a392955bb80452da94002414ab0c6a269.tar.gz opensim-SC-a1c4585a392955bb80452da94002414ab0c6a269.tar.bz2 opensim-SC-a1c4585a392955bb80452da94002414ab0c6a269.tar.xz | |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs')
| -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 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) |