aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Scripting
diff options
context:
space:
mode:
authorTeravus Ovares2009-01-23 11:00:36 +0000
committerTeravus Ovares2009-01-23 11:00:36 +0000
commit74df9f9c816f54fc60b131a347e7e1f1988b1fe2 (patch)
tree9f8080c00b583a68c9cfa595e62473d4018970c5 /OpenSim/Region/Environment/Modules/Scripting
parentadd event queue code for sending group IM for future group support (diff)
downloadopensim-SC_OLD-74df9f9c816f54fc60b131a347e7e1f1988b1fe2.zip
opensim-SC_OLD-74df9f9c816f54fc60b131a347e7e1f1988b1fe2.tar.gz
opensim-SC_OLD-74df9f9c816f54fc60b131a347e7e1f1988b1fe2.tar.bz2
opensim-SC_OLD-74df9f9c816f54fc60b131a347e7e1f1988b1fe2.tar.xz
* Adds a synchronous jpeg decode for pre-caching purposes
* When the DynamicTextureModule creates a j2k image, pre-cache the decode so that it doesn't stall any client threads.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Scripting')
-rw-r--r--OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs
index e9fe373..0974f02 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -242,6 +242,13 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture
242 242
243 LastAssetID = asset.FullID; 243 LastAssetID = asset.FullID;
244 244
245 IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>();
246 if (cacheLayerDecode != null)
247 {
248 cacheLayerDecode.syncdecode(asset.FullID, asset.Data);
249 }
250 cacheLayerDecode = null;
251
245 // mostly keep the values from before 252 // mostly keep the values from before
246 Primitive.TextureEntry tmptex = part.Shape.Textures; 253 Primitive.TextureEntry tmptex = part.Shape.Textures;
247 254