From e83877692046068735af97eb9f40cea1a09ae66c Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 27 Apr 2010 17:13:54 -0700
Subject: * Thanks cmickeyb, for a patch that sanity checks if the response
 from m_Database.GetAsset(assetID) is null in AssetService.cs

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

diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index ed87f3f..4e512e7 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -106,7 +106,10 @@ namespace OpenSim.Services.AssetService
                 return null;
 
             AssetBase asset = m_Database.GetAsset(assetID);
-            return asset.Metadata;
+            if (asset != null)
+                return asset.Metadata;
+
+            return null;
         }
 
         public byte[] GetData(string id)
-- 
cgit v1.1