aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs10
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 678e772..8814fd8 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -251,7 +251,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
251 public string BodyData; 251 public string BodyData;
252 public string ContentType; 252 public string ContentType;
253 public byte FrontAlpha = 255; 253 public byte FrontAlpha = 255;
254 public UUID LastAssetID;
255 public string Params; 254 public string Params;
256 public UUID PrimID; 255 public UUID PrimID;
257 public bool SetNewFrontAlpha = false; 256 public bool SetNewFrontAlpha = false;
@@ -264,7 +263,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
264 263
265 public DynamicTextureUpdater() 264 public DynamicTextureUpdater()
266 { 265 {
267 LastAssetID = UUID.Zero;
268 UpdateTimer = 0; 266 UpdateTimer = 0;
269 BodyData = null; 267 BodyData = null;
270 } 268 }
@@ -307,21 +305,21 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
307 } 305 }
308 306
309 // Create a new asset for user 307 // Create a new asset for user
310 AssetBase asset = new AssetBase(UUID.Random(), "DynamicImage" + Util.RandomClass.Next(1, 10000), (sbyte)AssetType.Texture, 308 AssetBase asset
311 scene.RegionInfo.RegionID.ToString()); 309 = new AssetBase(
310 UUID.Random(), "DynamicImage" + Util.RandomClass.Next(1, 10000), (sbyte)AssetType.Texture,
311 scene.RegionInfo.RegionID.ToString());
312 asset.Data = assetData; 312 asset.Data = assetData;
313 asset.Description = String.Format("URL image : {0}", Url); 313 asset.Description = String.Format("URL image : {0}", Url);
314 asset.Local = false; 314 asset.Local = false;
315 asset.Temporary = ((Disp & DISP_TEMP) != 0); 315 asset.Temporary = ((Disp & DISP_TEMP) != 0);
316 scene.AssetService.Store(asset); 316 scene.AssetService.Store(asset);
317// scene.CommsManager.AssetCache.AddAsset(asset);
318 317
319 IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>(); 318 IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>();
320 if (cacheLayerDecode != null) 319 if (cacheLayerDecode != null)
321 { 320 {
322 cacheLayerDecode.Decode(asset.FullID, asset.Data); 321 cacheLayerDecode.Decode(asset.FullID, asset.Data);
323 cacheLayerDecode = null; 322 cacheLayerDecode = null;
324 LastAssetID = asset.FullID;
325 } 323 }
326 324
327 UUID oldID = UUID.Zero; 325 UUID oldID = UUID.Zero;