From 5a18ea31cf9d9a97fc1a65f8623b633c244221c2 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 30 Jan 2017 13:59:05 +0000
Subject: 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.
---
 OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')

diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index fb408a4..3e47782 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -299,7 +299,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 if (bakedTextureFace == null)
                     continue;
 
-                AssetBase asset = cache.Get(bakedTextureFace.TextureID.ToString());
+                bool negative;
+                AssetBase asset = cache.Get(bakedTextureFace.TextureID.ToString(), out negative);
 
                 if (asset != null && asset.Local)
                 {
-- 
cgit v1.1