diff options
author | John Hurliman | 2009-09-30 12:18:22 -0700 |
---|---|---|
committer | Melanie | 2009-09-30 19:26:53 +0100 |
commit | f56dc5fcda16d96a309120b2a75a623cf455a8e8 (patch) | |
tree | cd86ef9956054404ee784f119593dd9c569d9572 /OpenSim/Region/CoreModules/Scripting/DynamicTexture | |
parent | Revert "Attempting to improve the robustness of texture decoding by always ig... (diff) | |
download | opensim-SC_OLD-f56dc5fcda16d96a309120b2a75a623cf455a8e8.zip opensim-SC_OLD-f56dc5fcda16d96a309120b2a75a623cf455a8e8.tar.gz opensim-SC_OLD-f56dc5fcda16d96a309120b2a75a623cf455a8e8.tar.bz2 opensim-SC_OLD-f56dc5fcda16d96a309120b2a75a623cf455a8e8.tar.xz |
Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K
* Renamed IJ2KDecoder and J2KDecoder member names to follow standard naming conventions * Removed j2kDecodeCache cruft and replaced it with the OpenSim cache system * Rewrote the default layer boundary algorithm to use percentages instead of an exponent * Switched from an infinite in-memory cache to an expiring cache (10 minute timeout) * Slightly quieted logging errors for failed texture decodes
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/DynamicTexture')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index 14eb9a2..9a6c49a 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
@@ -325,7 +325,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
325 | IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>(); | 325 | IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>(); |
326 | if (cacheLayerDecode != null) | 326 | if (cacheLayerDecode != null) |
327 | { | 327 | { |
328 | cacheLayerDecode.syncdecode(asset.FullID, asset.Data); | 328 | cacheLayerDecode.Decode(asset.FullID, asset.Data); |
329 | cacheLayerDecode = null; | 329 | cacheLayerDecode = null; |
330 | LastAssetID = asset.FullID; | 330 | LastAssetID = asset.FullID; |
331 | } | 331 | } |