diff options
author | John Hurliman | 2010-04-08 12:31:44 -0700 |
---|---|---|
committer | John Hurliman | 2010-04-08 12:31:44 -0700 |
commit | 3f6c4c150e3910e79ee3dc94f9304c16265512c0 (patch) | |
tree | ca83d44c56ab70535dfe04f068f5d0bfd1abb7da /OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |
parent | * Fixing incorrect documentation for the continuation passing style IAssetSer... (diff) | |
download | opensim-SC_OLD-3f6c4c150e3910e79ee3dc94f9304c16265512c0.zip opensim-SC_OLD-3f6c4c150e3910e79ee3dc94f9304c16265512c0.tar.gz opensim-SC_OLD-3f6c4c150e3910e79ee3dc94f9304c16265512c0.tar.bz2 opensim-SC_OLD-3f6c4c150e3910e79ee3dc94f9304c16265512c0.tar.xz |
* Adds IAssetService.GetCached() to allow asset fetching from the local cache only
* Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer
* Sanity check for null reference in LLClientView.RefreshGroupMembership()
Diffstat (limited to '')
-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) |