diff options
| author | John Hurliman | 2010-04-08 15:00:01 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-04-08 15:00:01 -0700 |
| commit | 0f3314c04ccd07e0ff9b5be69903b0a72dd73115 (patch) | |
| tree | 39fbecab8f5ae7232f625527058c7598e55dc46a /OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |
| parent | add nant distbin target (diff) | |
| download | opensim-SC_OLD-0f3314c04ccd07e0ff9b5be69903b0a72dd73115.zip opensim-SC_OLD-0f3314c04ccd07e0ff9b5be69903b0a72dd73115.tar.gz opensim-SC_OLD-0f3314c04ccd07e0ff9b5be69903b0a72dd73115.tar.bz2 opensim-SC_OLD-0f3314c04ccd07e0ff9b5be69903b0a72dd73115.tar.xz | |
Backported GetTextureModule and IAssetService.GetCached()
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index 8e311d7..84fbcd3 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) |