OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmerge

avinationmerge
Melanie 2011-10-12 07:23:32 +01:00
parent b716d98e23 013bf2775f
commit 5d3acc9ac3
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
View File

@ -251,7 +251,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
public string BodyData; public string BodyData;
public string ContentType; public string ContentType;
public byte FrontAlpha = 255; public byte FrontAlpha = 255;
public UUID LastAssetID;
public string Params; public string Params;
public UUID PrimID; public UUID PrimID;
public bool SetNewFrontAlpha = false; public bool SetNewFrontAlpha = false;
@ -264,7 +263,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
public DynamicTextureUpdater() public DynamicTextureUpdater()
{ {
LastAssetID = UUID.Zero;
UpdateTimer = 0; UpdateTimer = 0;
BodyData = null; BodyData = null;
} }
@ -307,21 +305,21 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
} }
// Create a new asset for user // Create a new asset for user
AssetBase asset = new AssetBase(UUID.Random(), "DynamicImage" + Util.RandomClass.Next(1, 10000), (sbyte)AssetType.Texture, AssetBase asset
scene.RegionInfo.RegionID.ToString()); = new AssetBase(
UUID.Random(), "DynamicImage" + Util.RandomClass.Next(1, 10000), (sbyte)AssetType.Texture,
scene.RegionInfo.RegionID.ToString());
asset.Data = assetData; asset.Data = assetData;
asset.Description = String.Format("URL image : {0}", Url); asset.Description = String.Format("URL image : {0}", Url);
asset.Local = false; asset.Local = false;
asset.Temporary = ((Disp & DISP_TEMP) != 0); asset.Temporary = ((Disp & DISP_TEMP) != 0);
scene.AssetService.Store(asset); scene.AssetService.Store(asset);
// scene.CommsManager.AssetCache.AddAsset(asset);
IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>(); IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>();
if (cacheLayerDecode != null) if (cacheLayerDecode != null)
{ {
cacheLayerDecode.Decode(asset.FullID, asset.Data); cacheLayerDecode.Decode(asset.FullID, asset.Data);
cacheLayerDecode = null; cacheLayerDecode = null;
LastAssetID = asset.FullID;
} }
UUID oldID = UUID.Zero; UUID oldID = UUID.Zero;