diff options
author | Justin Clark-Casey (justincc) | 2012-09-15 02:12:26 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-15 02:12:26 +0100 |
commit | 1ec84ac8b160c1a6ee903b832c75635d1219fe5a (patch) | |
tree | d729f94cdfbfa4a5f26d3127fa61c4ca20b36bd8 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs | |
parent | For FlotsamAssetCache, always update access times of cached scene assets befo... (diff) | |
download | opensim-SC_OLD-1ec84ac8b160c1a6ee903b832c75635d1219fe5a.zip opensim-SC_OLD-1ec84ac8b160c1a6ee903b832c75635d1219fe5a.tar.gz opensim-SC_OLD-1ec84ac8b160c1a6ee903b832c75635d1219fe5a.tar.bz2 opensim-SC_OLD-1ec84ac8b160c1a6ee903b832c75635d1219fe5a.tar.xz |
Add basic asset connector tests to check behaviour for normal, local and temporary assets.
Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load
Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs index c78915f..449c1f1 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs | |||
@@ -204,8 +204,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
204 | public byte[] GetData(string id) | 204 | public byte[] GetData(string id) |
205 | { | 205 | { |
206 | // m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Requesting data for asset {0}", id); | 206 | // m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Requesting data for asset {0}", id); |
207 | 207 | ||
208 | AssetBase asset = m_Cache.Get(id); | 208 | AssetBase asset = null; |
209 | |||
210 | if (m_Cache != null) | ||
211 | asset = m_Cache.Get(id); | ||
209 | 212 | ||
210 | if (asset != null) | 213 | if (asset != null) |
211 | return asset.Data; | 214 | return asset.Data; |