From 7ecc9408a9999fe4e1947532e68cd1d53e08d060 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Thu, 9 Apr 2020 16:08:44 +0100
Subject: [PATCH] flag baked texture assets

---
 .../UploadBakedTextureHandler.cs              | 21 +++++++------------
 .../Linden/Caps/UploadBakedTextureModule.cs   |  7 -------
 .../AvatarFactory/AvatarFactoryModule.cs      |  1 +
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
index dc12320576..3c4812a70e 100644
--- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
@@ -65,24 +65,19 @@ namespace OpenSim.Capabilities.Handlers
         {
             try
             {
-                string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath;
-                string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
+                string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000");
 
                 BakedTextureUploader uploader =
-                    new BakedTextureUploader(capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_HostCapsObj.AgentID);
+                    new BakedTextureUploader(capsBase, m_HostCapsObj.HttpListener, m_HostCapsObj.AgentID);
                 uploader.OnUpLoad += BakedTextureUploaded;
 
                 m_HostCapsObj.HttpListener.AddStreamHandler(
-                    new BinaryStreamHandler(
-                        "POST", capsBase + uploaderPath, uploader.uploaderCaps, "UploadBakedTexture", null));
+                    new BinaryStreamHandler("POST", capsBase, uploader.uploaderCaps, "UploadBakedTexture", null));
 
-                string protocol = "http://";
-
-                if (m_HostCapsObj.SSLCaps)
-                    protocol = "https://";
+                string protocol = m_HostCapsObj.SSLCaps ? "https://" : "http://";
 
                 string uploaderURL = protocol + m_HostCapsObj.HostName + ":" +
-                        m_HostCapsObj.Port.ToString() + capsBase + uploaderPath;
+                        m_HostCapsObj.Port.ToString() + capsBase;
 
                 LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
                 uploadResponse.uploader = uploaderURL;
@@ -112,6 +107,7 @@ namespace OpenSim.Capabilities.Handlers
             asset.Data = data;
             asset.Temporary = true;
             asset.Local = true;
+            asset.Flags = AssetFlags.AvatarBake;
             m_assetService.Store(asset);
         }
     }
@@ -145,13 +141,10 @@ namespace OpenSim.Capabilities.Handlers
         /// <returns></returns>
         public string uploaderCaps(byte[] data, string path, string param)
         {
-            Action<UUID, byte[]> handlerUpLoad = OnUpLoad;
-
             // Don't do this asynchronously, otherwise it's possible for the client to send set appearance information
             // on another thread which might send out avatar updates before the asset has been put into the asset
             // service.
-            if (handlerUpLoad != null)
-                handlerUpLoad(newAssetID, data);
+            OnUpLoad?.Invoke(newAssetID, data);
 
             string res = String.Empty;
             LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index b406b3743a..aaca147a51 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -26,14 +26,7 @@
  */
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Reflection;
-using System.IO;
-using System.Web;
 using log4net;
 using Nini.Config;
 using Mono.Addins;
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index b985630480..2d12f84134 100755
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -609,6 +609,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                                 wearableCache[j].TextureAsset = bakedModuleCache[i].TextureAsset;
                                 bakedModuleCache[i].TextureAsset.Temporary = true;
                                 bakedModuleCache[i].TextureAsset.Local = true;
+                                bakedModuleCache[i].TextureAsset.Flags = AssetFlags.AvatarBake;
                                 cache.Cache(bakedModuleCache[i].TextureAsset);
                             }
                         }