diff options
| author | Melanie | 2010-04-29 23:33:26 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-29 23:33:26 +0100 |
| commit | 08ebcdb0b8122b687fb27d21076d0d01941ed8e2 (patch) | |
| tree | 311775c3fc4db3ccb3f6b12376a69b0d08aede89 /OpenSim/Services/AssetService | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Started redoing HGInventoryBroker for XInventory and with multi-protocol in m... (diff) | |
| download | opensim-SC-08ebcdb0b8122b687fb27d21076d0d01941ed8e2.zip opensim-SC-08ebcdb0b8122b687fb27d21076d0d01941ed8e2.tar.gz opensim-SC-08ebcdb0b8122b687fb27d21076d0d01941ed8e2.tar.bz2 opensim-SC-08ebcdb0b8122b687fb27d21076d0d01941ed8e2.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 5 |
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) |