diff options
| author | Justin Clark-Casey (justincc) | 2010-04-30 17:54:00 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-04-30 17:54:00 +0100 |
| commit | 89e79c11335d55ae8131d6fa92218bf387e6c48e (patch) | |
| tree | bb96e1093123b21e41f52e61000398f82f83f23b /OpenSim/Services/AssetService | |
| parent | rename SQLiteNG to SQLite and SQLite to SQLiteLegacy (diff) | |
| parent | Fix some symbol errors (diff) | |
| download | opensim-SC-89e79c11335d55ae8131d6fa92218bf387e6c48e.zip opensim-SC-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.gz opensim-SC-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.bz2 opensim-SC-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/AssetService')
| -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) |