aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AssetService
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-08 18:45:52 +0000
committerMelanie Thielker2009-05-08 18:45:52 +0000
commita1631c496ef7965a8f0b388b39ae521cfb02b11a (patch)
tree903926f79d6df67b23b533ac3d5db5e77461f5b5 /OpenSim/Services/AssetService
parentfix up the comments a little (diff)
downloadopensim-SC-a1631c496ef7965a8f0b388b39ae521cfb02b11a.zip
opensim-SC-a1631c496ef7965a8f0b388b39ae521cfb02b11a.tar.gz
opensim-SC-a1631c496ef7965a8f0b388b39ae521cfb02b11a.tar.bz2
opensim-SC-a1631c496ef7965a8f0b388b39ae521cfb02b11a.tar.xz
The new asset server now actually serves existing assets
Diffstat (limited to 'OpenSim/Services/AssetService')
-rw-r--r--OpenSim/Services/AssetService/AssetService.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 233fa62..d6e5141 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -32,6 +32,7 @@ using log4net;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Data; 33using OpenSim.Data;
34using OpenSim.Services.Interfaces; 34using OpenSim.Services.Interfaces;
35using OpenMetaverse;
35 36
36namespace OpenSim.Services.AssetService 37namespace OpenSim.Services.AssetService
37{ 38{
@@ -63,7 +64,12 @@ namespace OpenSim.Services.AssetService
63 64
64 public AssetBase Get(string id) 65 public AssetBase Get(string id)
65 { 66 {
66 return null; 67 UUID assetID;
68
69 if (!UUID.TryParse(id, out assetID))
70 return null;
71
72 return m_Database.FetchAsset(assetID);
67 } 73 }
68 74
69 public AssetMetadata GetMetadata(string id) 75 public AssetMetadata GetMetadata(string id)