aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/WearableCacheItem.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-30 13:59:05 +0000
committerMelanie Thielker2017-01-30 13:59:05 +0000
commit5a18ea31cf9d9a97fc1a65f8623b633c244221c2 (patch)
tree80eae98cddde4ffbdb7287ad0ac82449c33cb316 /OpenSim/Framework/WearableCacheItem.cs
parentComment two very spammy debug messages that the usr can't do anything about (diff)
downloadopensim-SC-5a18ea31cf9d9a97fc1a65f8623b633c244221c2.zip
opensim-SC-5a18ea31cf9d9a97fc1a65f8623b633c244221c2.tar.gz
opensim-SC-5a18ea31cf9d9a97fc1a65f8623b633c244221c2.tar.bz2
opensim-SC-5a18ea31cf9d9a97fc1a65f8623b633c244221c2.tar.xz
Make negative asset caching actually work
Also fixes some merge artefacts in HGAssetBroker where cached assets were requested but not actually used and completely squelch a materials debug message because there is nothing the user can do to fix it anyway.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/WearableCacheItem.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs
index ccaf69e..f181c39 100644
--- a/OpenSim/Framework/WearableCacheItem.cs
+++ b/OpenSim/Framework/WearableCacheItem.cs
@@ -113,7 +113,8 @@ namespace OpenSim.Framework
113 { 113 {
114 if (dataCache.Check(item.TextureID.ToString())) 114 if (dataCache.Check(item.TextureID.ToString()))
115 { 115 {
116 AssetBase assetItem = dataCache.Get(item.TextureID.ToString()); 116 bool negative;
117 AssetBase assetItem = dataCache.Get(item.TextureID.ToString(), out negative);
117 if (assetItem != null) 118 if (assetItem != null)
118 { 119 {
119 itemmap.Add("assetdata", OSD.FromBinary(assetItem.Data)); 120 itemmap.Add("assetdata", OSD.FromBinary(assetItem.Data));