diff options
-rw-r--r-- | OpenSim/Capabilities/LLSDAssetUploadRequest.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Capabilities/LLSDAssetUploadRequest.cs index 6e66f0a..f981bf0 100644 --- a/OpenSim/Capabilities/LLSDAssetUploadRequest.cs +++ b/OpenSim/Capabilities/LLSDAssetUploadRequest.cs | |||
@@ -31,6 +31,15 @@ using OpenMetaverse; | |||
31 | namespace OpenSim.Framework.Capabilities | 31 | namespace OpenSim.Framework.Capabilities |
32 | { | 32 | { |
33 | [OSDMap] | 33 | [OSDMap] |
34 | public class LLSDAssetResource | ||
35 | { | ||
36 | public OSDArray instance_list = new OSDArray(); | ||
37 | public OSDArray texture_list = new OSDArray(); | ||
38 | public OSDArray mesh_list = new OSDArray(); | ||
39 | public string metric = String.Empty; | ||
40 | } | ||
41 | |||
42 | [OSDMap] | ||
34 | public class LLSDAssetUploadRequest | 43 | public class LLSDAssetUploadRequest |
35 | { | 44 | { |
36 | public string asset_type = String.Empty; | 45 | public string asset_type = String.Empty; |
@@ -38,7 +47,7 @@ namespace OpenSim.Framework.Capabilities | |||
38 | public UUID folder_id = UUID.Zero; | 47 | public UUID folder_id = UUID.Zero; |
39 | public string inventory_type = String.Empty; | 48 | public string inventory_type = String.Empty; |
40 | public string name = String.Empty; | 49 | public string name = String.Empty; |
41 | 50 | public LLSDAssetResource asset_resources = new LLSDAssetResource(); | |
42 | public LLSDAssetUploadRequest() | 51 | public LLSDAssetUploadRequest() |
43 | { | 52 | { |
44 | } | 53 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 328dc75..df43991 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 | |||
431 | 431 | ||
432 | if (llsdRequest.asset_type == "texture" || | 432 | if (llsdRequest.asset_type == "texture" || |
433 | llsdRequest.asset_type == "animation" || | 433 | llsdRequest.asset_type == "animation" || |
434 | llsdRequest.asset_type == "mesh" || | ||
434 | llsdRequest.asset_type == "sound") | 435 | llsdRequest.asset_type == "sound") |
435 | { | 436 | { |
436 | ScenePresence avatar = null; | 437 | ScenePresence avatar = null; |