Fix a major security problem with osSetDynamicTexture which allowed the deletion of /any/ asset.

1 files changed, 12 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index f51d0c2..679c871 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -358,11 +358,18 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                     // tmptex.DefaultTexture.Fullbright = true;
 
                     part.UpdateTexture(tmptex);
-                }
-
-                if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))
-                {
-                    scene.AssetService.Delete(oldID.ToString());
+                }

+

+                if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))

+                {

+                    if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString());

+                    if (oldAsset != null)

+                    {

+                        if (oldAsset.Temporary == true)

+                        {

+                            scene.AssetService.Delete(oldID.ToString());

+                        }

+                    }

                 }
             }