diff options
Diffstat (limited to 'OpenSim/Services/Connectors')
3 files changed, 30 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) |
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; |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 36c51c3..79e49a1 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
@@ -123,6 +123,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
123 | return GetRemote(id); | 123 | return GetRemote(id); |
124 | } | 124 | } |
125 | 125 | ||
126 | public AssetBase GetCached(string id) | ||
127 | { | ||
128 | if (m_cache != null) | ||
129 | return m_cache.Get(id); | ||
130 | |||
131 | return null; | ||
132 | } | ||
133 | |||
126 | /// <summary> | 134 | /// <summary> |
127 | /// Get an asset's metadata | 135 | /// Get an asset's metadata |
128 | /// </summary> | 136 | /// </summary> |