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/Avatar | |
| parent | Comment two very spammy debug messages that the usr can't do anything about (diff) | |
| download | opensim-SC_OLD-5a18ea31cf9d9a97fc1a65f8623b633c244221c2.zip opensim-SC_OLD-5a18ea31cf9d9a97fc1a65f8623b633c244221c2.tar.gz opensim-SC_OLD-5a18ea31cf9d9a97fc1a65f8623b633c244221c2.tar.bz2 opensim-SC_OLD-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/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
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 | |||
| 299 | if (bakedTextureFace == null) | 299 | if (bakedTextureFace == null) |
| 300 | continue; | 300 | continue; |
| 301 | 301 | ||
| 302 | AssetBase asset = cache.Get(bakedTextureFace.TextureID.ToString()); | 302 | bool negative; |
| 303 | AssetBase asset = cache.Get(bakedTextureFace.TextureID.ToString(), out negative); | ||
| 303 | 304 | ||
| 304 | if (asset != null && asset.Local) | 305 | if (asset != null && asset.Local) |
| 305 | { | 306 | { |