aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AssetService/AssetService.cs
diff options
context:
space:
mode:
authorJohn Hurliman2010-04-08 15:00:01 -0700
committerJohn Hurliman2010-04-08 15:00:01 -0700
commit0f3314c04ccd07e0ff9b5be69903b0a72dd73115 (patch)
tree39fbecab8f5ae7232f625527058c7598e55dc46a /OpenSim/Services/AssetService/AssetService.cs
parentadd nant distbin target (diff)
downloadopensim-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 'OpenSim/Services/AssetService/AssetService.cs')
-rw-r--r--OpenSim/Services/AssetService/AssetService.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index b9723a8..ed87f3f 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -93,6 +93,11 @@ namespace OpenSim.Services.AssetService
93 return m_Database.GetAsset(assetID); 93 return m_Database.GetAsset(assetID);
94 } 94 }
95 95
96 public AssetBase GetCached(string id)
97 {
98 return Get(id);
99 }
100
96 public AssetMetadata GetMetadata(string id) 101 public AssetMetadata GetMetadata(string id)
97 { 102 {
98 UUID assetID; 103 UUID assetID;