aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorJohn Hurliman2010-04-27 17:13:54 -0700
committerJohn Hurliman2010-04-27 17:13:54 -0700
commite83877692046068735af97eb9f40cea1a09ae66c (patch)
treeb9d5c2535984f0b83b882a1a1f20ec2051139c60 /OpenSim/Services
parent* Thanks cmickeyb, for a patch that corrects an invalid construction of Primi... (diff)
downloadopensim-SC_OLD-e83877692046068735af97eb9f40cea1a09ae66c.zip
opensim-SC_OLD-e83877692046068735af97eb9f40cea1a09ae66c.tar.gz
opensim-SC_OLD-e83877692046068735af97eb9f40cea1a09ae66c.tar.bz2
opensim-SC_OLD-e83877692046068735af97eb9f40cea1a09ae66c.tar.xz
* Thanks cmickeyb, for a patch that sanity checks if the response from m_Database.GetAsset(assetID) is null in AssetService.cs
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/AssetService/AssetService.cs5
1 files changed, 4 insertions, 1 deletions
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
106 return null; 106 return null;
107 107
108 AssetBase asset = m_Database.GetAsset(assetID); 108 AssetBase asset = m_Database.GetAsset(assetID);
109 return asset.Metadata; 109 if (asset != null)
110 return asset.Metadata;
111
112 return null;
110 } 113 }
111 114
112 public byte[] GetData(string id) 115 public byte[] GetData(string id)