From 5e4fc6e91e5edffd1dc23af4f583d6294f394a3d Mon Sep 17 00:00:00 2001
From: diva
Date: Fri, 15 May 2009 05:00:25 +0000
Subject: Heart surgery on asset service code bits. Affects OpenSim.ini
 configuration -- please see the example. Affects region servers only. This
 may break a lot of things, but it needs to go in. It was tested in standalone
 and the UCI grid, but it needs a lot more testing. Known problems: * HG asset
 transfers are borked for now * missing texture is missing * 3 unit tests
 commented out for now

---
 .../CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs')

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
                 if (BlendWithOldTexture)
                 {
                     UUID lastTextureID = part.Shape.Textures.DefaultTexture.TextureID;
-                    oldAsset = scene.CommsManager.AssetCache.GetAsset(lastTextureID, true);
+                    oldAsset = scene.AssetService.Get(lastTextureID.ToString());
                     if (oldAsset != null)
                     {
                         assetData = BlendTextures(data, oldAsset.Data, SetNewFrontAlpha, FrontAlpha);
@@ -290,7 +290,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                 asset.Description = "dynamic image";
                 asset.Local = false;
                 asset.Temporary = true;
-                scene.CommsManager.AssetCache.AddAsset(asset);
+                scene.AssetService.Store(asset);
 
                 LastAssetID = asset.FullID;
 
@@ -315,7 +315,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                 part.Shape.Textures = tmptex;
                 part.ScheduleFullUpdate();
 
-                scene.CommsManager.AssetCache.ExpireAsset(oldID);
             }
 
             private byte[] BlendTextures(byte[] frontImage, byte[] backImage, bool setNewAlpha, byte newAlpha)
-- 
cgit v1.1