From a1631c496ef7965a8f0b388b39ae521cfb02b11a Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 8 May 2009 18:45:52 +0000
Subject: The new asset server now actually serves existing assets

---
 OpenSim/Services/AssetService/AssetService.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services/AssetService')

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;
 using OpenSim.Framework;
 using OpenSim.Data;
 using OpenSim.Services.Interfaces;
+using OpenMetaverse;
 
 namespace OpenSim.Services.AssetService
 {
@@ -63,7 +64,12 @@ namespace OpenSim.Services.AssetService
 
         public AssetBase Get(string id)
         {
-            return null;
+            UUID assetID;
+
+            if (!UUID.TryParse(id, out assetID))
+                return null;
+
+            return m_Database.FetchAsset(assetID);
         }
 
         public AssetMetadata GetMetadata(string id)
-- 
cgit v1.1