1 files changed, 81 insertions, 66 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index a686a4d..090cb7d 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -135,17 +135,13 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                         m_reuseableDynamicTextures.Store(
                             GenerateReusableTextureKey(texture.InputCommands, texture.InputParams), newTextureID);
                     }
+                    updater.newTextureID = newTextureID;
                 }
-            }
 
-            if (updater.UpdateTimer == 0)
-            {
                 lock (Updaters)
                 {
-                    if (!Updaters.ContainsKey(updater.UpdaterID))
-                    {
+                    if (Updaters.ContainsKey(updater.UpdaterID))
                         Updaters.Remove(updater.UpdaterID);
-                    }
                 }
             }
         }
@@ -172,21 +168,20 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
         }
 
         public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url,
-                                         string extraParams, int updateTimer)
+                                         string extraParams)
         {
-            return AddDynamicTextureURL(simID, primID, contentType, url, extraParams, updateTimer, false, 255);
+            return AddDynamicTextureURL(simID, primID, contentType, url, extraParams, false, 255);
         }
 
         public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url,
-                                         string extraParams, int updateTimer, bool SetBlending, byte AlphaValue)
+                                         string extraParams, bool SetBlending, byte AlphaValue)
         {
-            return AddDynamicTextureURL(simID, primID, contentType, url,
-                                          extraParams, updateTimer, SetBlending, 
-                                         (int)(DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
+            return AddDynamicTextureURL(simID, primID, contentType, url, extraParams, SetBlending,
+                                         (DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
         }
 
         public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url,
-                                         string extraParams, int updateTimer, bool SetBlending, 
+                                         string extraParams, bool SetBlending,
                                          int disp, byte AlphaValue, int face)
         {
             if (RenderPlugins.ContainsKey(contentType))
@@ -196,7 +191,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                 updater.PrimID = primID;
                 updater.ContentType = contentType;
                 updater.Url = url;
-                updater.UpdateTimer = updateTimer;
                 updater.UpdaterID = UUID.Random();
                 updater.Params = extraParams;
                 updater.BlendWithOldTexture = SetBlending;
@@ -213,26 +207,27 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                 }
 
                 RenderPlugins[contentType].AsyncConvertUrl(updater.UpdaterID, url, extraParams);
-                return updater.UpdaterID;
+                return updater.newTextureID;
             }
             return UUID.Zero;
         }
 
         public UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data,
-                                          string extraParams, int updateTimer)
+                                          string extraParams)
         {
-            return AddDynamicTextureData(simID, primID, contentType, data, extraParams, updateTimer, false, 255);
+            return AddDynamicTextureData(simID, primID, contentType, data, extraParams, false,
+                                            (DISP_TEMP|DISP_EXPIRE), 255, ALL_SIDES);
         }
 
         public UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data,
-                                          string extraParams, int updateTimer, bool SetBlending, byte AlphaValue)
+                                          string extraParams, bool SetBlending, byte AlphaValue)
         {
-            return AddDynamicTextureData(simID, primID, contentType, data, extraParams, updateTimer, SetBlending, 
-                                          (int) (DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
+            return AddDynamicTextureData(simID, primID, contentType, data, extraParams, SetBlending,
+                                          (DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
         }
 
         public UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data,
-                                          string extraParams, int updateTimer, bool SetBlending, int disp, byte AlphaValue, int face)
+                                          string extraParams, bool SetBlending, int disp, byte AlphaValue, int face)
         {
             if (!RenderPlugins.ContainsKey(contentType))
                 return UUID.Zero;
@@ -258,7 +253,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
             updater.PrimID = primID;
             updater.ContentType = contentType;
             updater.BodyData = data;
-            updater.UpdateTimer = updateTimer;
             updater.UpdaterID = UUID.Random();
             updater.Params = extraParams;
             updater.BlendWithOldTexture = SetBlending;
@@ -314,7 +308,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                 updater.UpdatePart(part, (UUID)objReusableTextureUUID);
             }
 
-            return updater.UpdaterID;
+            return updater.newTextureID;
         }
 
         private string GenerateReusableTextureKey(string data, string extraParams)
@@ -404,17 +398,15 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
             public byte FrontAlpha = 255;
             public string Params;
             public UUID PrimID;
-            public bool SetNewFrontAlpha = false;
             public UUID SimUUID;
             public UUID UpdaterID;
-            public int UpdateTimer;
             public int Face;
             public int Disp;
             public string Url;
+            public UUID newTextureID;
 
             public DynamicTextureUpdater()
             {
-                UpdateTimer = 0;
                 BodyData = null;
             }
 
@@ -436,16 +428,23 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                     // FIXME: Need to return the appropriate ID if only a single face is replaced.
                     oldID = tmptex.DefaultTexture.TextureID;
 
+                    // not using parts number of faces because that fails on old meshs
                     if (Face == ALL_SIDES)
                     {
                         oldID = tmptex.DefaultTexture.TextureID;
                         tmptex.DefaultTexture.TextureID = textureID;
+                        for(int i = 0; i < tmptex.FaceTextures.Length; i++)
+                        {
+                            if(tmptex.FaceTextures[i] != null)
+                                tmptex.FaceTextures[i].TextureID = textureID;
+                        }
                     }
                     else
                     {
                         try
                         {
                             Primitive.TextureEntryFace texface = tmptex.CreateFace((uint)Face);
+                            oldID = texface.TextureID;
                             texface.TextureID = textureID;
                             tmptex.FaceTextures[Face] = texface;
                         }
@@ -455,10 +454,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                         }
                     }
 
-                    // I'm pretty sure we always want to force this to true
-                    // I'm pretty sure noone whats to set fullbright true if it wasn't true before.
-                    // tmptex.DefaultTexture.Fullbright = true;
-
                     part.UpdateTextureEntry(tmptex.GetBytes());
                 }
 
@@ -478,26 +473,39 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 
                 if (part == null || data == null || data.Length <= 1)
                 {
-                    string msg = 
+                    string msg =
                         String.Format("DynamicTextureModule: Error preparing image using URL {0}", Url);
                     scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,
                                   0, part.ParentGroup.RootPart.AbsolutePosition, part.Name, part.UUID, false);
-                    
+
                     return UUID.Zero;
                 }
 
                 byte[] assetData = null;
                 AssetBase oldAsset = null;
-                
+
                 if (BlendWithOldTexture)
                 {
-                    Primitive.TextureEntryFace defaultFace = part.Shape.Textures.DefaultTexture;
-                    if (defaultFace != null)
+                    Primitive.TextureEntryFace curFace;
+                    if(Face == ALL_SIDES)
+                        curFace = part.Shape.Textures.DefaultTexture;
+                    else
                     {
-                        oldAsset = scene.AssetService.Get(defaultFace.TextureID.ToString());
+                        try
+                        {
+                            curFace = part.Shape.Textures.GetFace((uint)Face);
+                        }
+                        catch
+                        {
+                            curFace = null;
+                        }
+                    }
+                    if (curFace != null)
+                    {
+                        oldAsset = scene.AssetService.Get(curFace.TextureID.ToString());
 
                         if (oldAsset != null)
-                            assetData = BlendTextures(data, oldAsset.Data, SetNewFrontAlpha, FrontAlpha);
+                            assetData = BlendTextures(data, oldAsset.Data, FrontAlpha);
                     }
                 }
 
@@ -548,42 +556,49 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                 return asset.FullID;
             }
 
-            private byte[] BlendTextures(byte[] frontImage, byte[] backImage, bool setNewAlpha, byte newAlpha)
+            private byte[] BlendTextures(byte[] frontImage, byte[] backImage, byte newAlpha)
             {
                 ManagedImage managedImage;
                 Image image;
 
-                if (OpenJPEG.DecodeToImage(frontImage, out managedImage, out image))
+                if (!OpenJPEG.DecodeToImage(frontImage, out managedImage, out image) || image == null)
+                    return null;
+
+                Bitmap image1 = new Bitmap(image);
+                image.Dispose();
+
+                if (!OpenJPEG.DecodeToImage(backImage, out managedImage, out image) || image == null)
                 {
-                    Bitmap image1 = new Bitmap(image);
+                    image1.Dispose();
+                    return null;
+                }
 
-                    if (OpenJPEG.DecodeToImage(backImage, out managedImage, out image))
-                    {
-                        Bitmap image2 = new Bitmap(image);
+                Bitmap image2 = new Bitmap(image);
+                image.Dispose();
 
-                        if (setNewAlpha)
-                            SetAlpha(ref image1, newAlpha);
+                if (newAlpha < 255)
+                    SetAlpha(ref image1, newAlpha);
 
-                        Bitmap joint = MergeBitMaps(image1, image2);
+                using(Bitmap joint = MergeBitMaps(image1, image2))
+                {
+                    image1.Dispose();
+                    image2.Dispose();
 
-                        byte[] result = new byte[0];
+                    byte[] result = new byte[0];
 
-                        try
-                        {
-                            result = OpenJPEG.EncodeFromImage(joint, true);
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat(
-                                "[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed.  Exception {0}{1}",
+                    try
+                    {
+                        result = OpenJPEG.EncodeFromImage(joint, true);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                        "[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed.  Exception {0}{1}",
                                 e.Message, e.StackTrace);
-                        }
-
-                        return result;
                     }
-                }
 
-                return null;
+                    return result;
+                }
             }
 
             public Bitmap MergeBitMaps(Bitmap front, Bitmap back)
@@ -592,12 +607,12 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                 Graphics jG;
 
                 joint = new Bitmap(back.Width, back.Height, PixelFormat.Format32bppArgb);
-                jG = Graphics.FromImage(joint);
-
-                jG.DrawImage(back, 0, 0, back.Width, back.Height);
-                jG.DrawImage(front, 0, 0, back.Width, back.Height);
-
-                return joint;
+                using(jG = Graphics.FromImage(joint))
+                {
+                    jG.DrawImage(back, 0, 0, back.Width, back.Height);
+                    jG.DrawImage(front, 0, 0, back.Width, back.Height);
+                    return joint;
+                }
             }
 
             private void SetAlpha(ref Bitmap b, byte alpha)