diff options
author | Melanie Thielker | 2017-01-30 13:59:05 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-30 13:59:05 +0000 |
commit | 5a18ea31cf9d9a97fc1a65f8623b633c244221c2 (patch) | |
tree | 80eae98cddde4ffbdb7287ad0ac82449c33cb316 /OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs | |
parent | Comment two very spammy debug messages that the usr can't do anything about (diff) | |
download | opensim-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 'OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs index 208963d..342d4d9 100644 --- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs | |||
@@ -131,8 +131,10 @@ namespace OpenSim.Region.CoreModules.Asset | |||
131 | // We don't do negative caching | 131 | // We don't do negative caching |
132 | } | 132 | } |
133 | 133 | ||
134 | public AssetBase Get(string id) | 134 | public AssetBase Get(string id, out bool negative) |
135 | { | 135 | { |
136 | negative = false; | ||
137 | |||
136 | Object asset = null; | 138 | Object asset = null; |
137 | m_Cache.TryGet(id, out asset); | 139 | m_Cache.TryGet(id, out asset); |
138 | 140 | ||