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/Connectors/Asset/HGAssetServiceConnector.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 'OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs index 677169d..34df54a 100644 --- a/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs | |||
@@ -116,6 +116,20 @@ namespace OpenSim.Services.Connectors | |||
116 | return null; | 116 | return null; |
117 | } | 117 | } |
118 | 118 | ||
119 | public AssetBase GetCached(string id) | ||
120 | { | ||
121 | string url = string.Empty; | ||
122 | string assetID = string.Empty; | ||
123 | |||
124 | if (StringToUrlAndAssetID(id, out url, out assetID)) | ||
125 | { | ||
126 | IAssetService connector = GetConnector(url); | ||
127 | return connector.GetCached(assetID); | ||
128 | } | ||
129 | |||
130 | return null; | ||
131 | } | ||
132 | |||
119 | public AssetMetadata GetMetadata(string id) | 133 | public AssetMetadata GetMetadata(string id) |
120 | { | 134 | { |
121 | string url = string.Empty; | 135 | string url = string.Empty; |