From 3f6c4c150e3910e79ee3dc94f9304c16265512c0 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Thu, 8 Apr 2010 12:31:44 -0700
Subject: * 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()

---
 OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs |  8 ++++++++
 .../Services/Connectors/Asset/HGAssetServiceConnector.cs   | 14 ++++++++++++++
 2 files changed, 22 insertions(+)

(limited to 'OpenSim/Services/Connectors/Asset')

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
             return asset;
         }
 
+        public AssetBase GetCached(string id)
+        {
+            if (m_Cache != null)
+                return m_Cache.Get(id);
+
+            return null;
+        }
+
         public AssetMetadata GetMetadata(string id)
         {
             if (m_Cache != null)
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
             return null;
         }
 
+        public AssetBase GetCached(string id)
+        {
+            string url = string.Empty;
+            string assetID = string.Empty;
+
+            if (StringToUrlAndAssetID(id, out url, out assetID))
+            {
+                IAssetService connector = GetConnector(url);
+                return connector.GetCached(assetID);
+            }
+
+            return null;
+        }
+
         public AssetMetadata GetMetadata(string id)
         {
             string url = string.Empty;
-- 
cgit v1.1