From d05af4bdad7d4855b05eba909c5b21714e5f438a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Mar 2013 22:14:34 +0000
Subject: Fix bug in AssetService where requesting data only for an asset would
 throw an exception if the asset did not exist.

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

(limited to 'OpenSim')

diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index e7eb6fe..422fd0a 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -146,7 +146,11 @@ namespace OpenSim.Services.AssetService
                 return null;
 
             AssetBase asset = m_Database.GetAsset(assetID);
-            return asset.Data;
+
+            if (asset != null)
+                return asset.Data;
+            else
+                return null;
         }
 
         public virtual bool Get(string id, Object sender, AssetRetrieved handler)
-- 
cgit v1.1