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/Services/AssetService/AssetService.cs | |
parent | * Fixing incorrect documentation for the continuation passing style IAssetSer... (diff) | |
download | opensim-SC-3f6c4c150e3910e79ee3dc94f9304c16265512c0.zip opensim-SC-3f6c4c150e3910e79ee3dc94f9304c16265512c0.tar.gz opensim-SC-3f6c4c150e3910e79ee3dc94f9304c16265512c0.tar.bz2 opensim-SC-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/Services/AssetService/AssetService.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index b9723a8..ed87f3f 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
@@ -93,6 +93,11 @@ namespace OpenSim.Services.AssetService | |||
93 | return m_Database.GetAsset(assetID); | 93 | return m_Database.GetAsset(assetID); |
94 | } | 94 | } |
95 | 95 | ||
96 | public AssetBase GetCached(string id) | ||
97 | { | ||
98 | return Get(id); | ||
99 | } | ||
100 | |||
96 | public AssetMetadata GetMetadata(string id) | 101 | public AssetMetadata GetMetadata(string id) |
97 | { | 102 | { |
98 | UUID assetID; | 103 | UUID assetID; |