diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index a2d6b45..063081e 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
@@ -264,7 +264,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
264 | if (BlendWithOldTexture) | 264 | if (BlendWithOldTexture) |
265 | { | 265 | { |
266 | UUID lastTextureID = part.Shape.Textures.DefaultTexture.TextureID; | 266 | UUID lastTextureID = part.Shape.Textures.DefaultTexture.TextureID; |
267 | oldAsset = scene.CommsManager.AssetCache.GetAsset(lastTextureID, true); | 267 | oldAsset = scene.AssetService.Get(lastTextureID.ToString()); |
268 | if (oldAsset != null) | 268 | if (oldAsset != null) |
269 | { | 269 | { |
270 | assetData = BlendTextures(data, oldAsset.Data, SetNewFrontAlpha, FrontAlpha); | 270 | assetData = BlendTextures(data, oldAsset.Data, SetNewFrontAlpha, FrontAlpha); |
@@ -290,7 +290,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
290 | asset.Description = "dynamic image"; | 290 | asset.Description = "dynamic image"; |
291 | asset.Local = false; | 291 | asset.Local = false; |
292 | asset.Temporary = true; | 292 | asset.Temporary = true; |
293 | scene.CommsManager.AssetCache.AddAsset(asset); | 293 | scene.AssetService.Store(asset); |
294 | 294 | ||
295 | LastAssetID = asset.FullID; | 295 | LastAssetID = asset.FullID; |
296 | 296 | ||
@@ -315,7 +315,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
315 | part.Shape.Textures = tmptex; | 315 | part.Shape.Textures = tmptex; |
316 | part.ScheduleFullUpdate(); | 316 | part.ScheduleFullUpdate(); |
317 | 317 | ||
318 | scene.CommsManager.AssetCache.ExpireAsset(oldID); | ||
319 | } | 318 | } |
320 | 319 | ||
321 | private byte[] BlendTextures(byte[] frontImage, byte[] backImage, bool setNewAlpha, byte newAlpha) | 320 | private byte[] BlendTextures(byte[] frontImage, byte[] backImage, bool setNewAlpha, byte newAlpha) |