From 245763b1b08d667aede3be7c092fa4c7200549c0 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 11 Sep 2012 20:30:30 +0100 Subject: [PATCH] let LLSDAssetUploadRequest include asset_resources information plus let NewAgentInventoryRequest know about mesh (does nothing with it still) --- OpenSim/Capabilities/LLSDAssetUploadRequest.cs | 11 ++++++++++- .../Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/OpenSim/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Capabilities/LLSDAssetUploadRequest.cs index 6e66f0acee..f981bf0fc1 100644 --- a/OpenSim/Capabilities/LLSDAssetUploadRequest.cs +++ b/OpenSim/Capabilities/LLSDAssetUploadRequest.cs @@ -30,6 +30,15 @@ using OpenMetaverse; namespace OpenSim.Framework.Capabilities { + [OSDMap] + public class LLSDAssetResource + { + public OSDArray instance_list = new OSDArray(); + public OSDArray texture_list = new OSDArray(); + public OSDArray mesh_list = new OSDArray(); + public string metric = String.Empty; + } + [OSDMap] public class LLSDAssetUploadRequest { @@ -38,7 +47,7 @@ namespace OpenSim.Framework.Capabilities public UUID folder_id = UUID.Zero; public string inventory_type = String.Empty; public string name = String.Empty; - + public LLSDAssetResource asset_resources = new LLSDAssetResource(); public LLSDAssetUploadRequest() { } diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 328dc754d8..df439911f6 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs @@ -431,6 +431,7 @@ namespace OpenSim.Region.ClientStack.Linden if (llsdRequest.asset_type == "texture" || llsdRequest.asset_type == "animation" || + llsdRequest.asset_type == "mesh" || llsdRequest.asset_type == "sound") { ScenePresence avatar = null;