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/ServiceConnectorsOut/Asset | |
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/Region/CoreModules/ServiceConnectorsOut/Asset')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs index af2f3d6..ebd6bbd 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs | |||
@@ -229,6 +229,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
229 | return asset; | 229 | return asset; |
230 | } | 230 | } |
231 | 231 | ||
232 | public AssetBase GetCached(string id) | ||
233 | { | ||
234 | if (m_Cache != null) | ||
235 | return m_Cache.Get(id); | ||
236 | |||
237 | return null; | ||
238 | } | ||
239 | |||
232 | public AssetMetadata GetMetadata(string id) | 240 | public AssetMetadata GetMetadata(string id) |
233 | { | 241 | { |
234 | AssetBase asset = null; | 242 | AssetBase asset = null; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs index 50348da..1b3419d 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs | |||
@@ -165,6 +165,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
165 | return asset; | 165 | return asset; |
166 | } | 166 | } |
167 | 167 | ||
168 | public AssetBase GetCached(string id) | ||
169 | { | ||
170 | if (m_Cache != null) | ||
171 | return m_Cache.Get(id); | ||
172 | |||
173 | return null; | ||
174 | } | ||
175 | |||
168 | public AssetMetadata GetMetadata(string id) | 176 | public AssetMetadata GetMetadata(string id) |
169 | { | 177 | { |
170 | AssetBase asset = null; | 178 | AssetBase asset = null; |