aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
diff options
context:
space:
mode:
authorJohn Hurliman2010-04-08 12:31:44 -0700
committerJohn Hurliman2010-04-08 12:31:44 -0700
commit3f6c4c150e3910e79ee3dc94f9304c16265512c0 (patch)
treeca83d44c56ab70535dfe04f068f5d0bfd1abb7da /OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
parent* Fixing incorrect documentation for the continuation passing style IAssetSer... (diff)
downloadopensim-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/Connectors/Asset/AssetServiceConnector.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index a5c157d..65b3537 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -111,6 +111,14 @@ namespace OpenSim.Services.Connectors
111 return asset; 111 return asset;
112 } 112 }
113 113
114 public AssetBase GetCached(string id)
115 {
116 if (m_Cache != null)
117 return m_Cache.Get(id);
118
119 return null;
120 }
121
114 public AssetMetadata GetMetadata(string id) 122 public AssetMetadata GetMetadata(string id)
115 { 123 {
116 if (m_Cache != null) 124 if (m_Cache != null)