aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Capabilities/LLSDAssetUploadRequest.cs11
-rw-r--r--OpenSim/Capabilities/LLSDAssetUploadResponse.cs23
2 files changed, 32 insertions, 2 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;
31namespace OpenSim.Framework.Capabilities 31namespace 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/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Capabilities/LLSDAssetUploadResponse.cs
index 0d6f7f9..18285b5 100644
--- a/OpenSim/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Capabilities/LLSDAssetUploadResponse.cs
@@ -30,11 +30,32 @@ using System;
30namespace OpenSim.Framework.Capabilities 30namespace OpenSim.Framework.Capabilities
31{ 31{
32 [OSDMap] 32 [OSDMap]
33 public class LLSDAssetUploadResponsePricebrkDown
34 {
35 public int mesh_streaming;
36 public int mesh_physics;
37 public int mesh_instance;
38 public int texture;
39 public int model;
40 }
41
42 [OSDMap]
43 public class LLSDAssetUploadResponseData
44 {
45 public double resource_cost;
46 public double model_streaming_cost;
47 public double simulation_cost;
48 public double physics_cost;
49 public LLSDAssetUploadResponsePricebrkDown upload_price_breakdown = new LLSDAssetUploadResponsePricebrkDown();
50 }
51
52 [OSDMap]
33 public class LLSDAssetUploadResponse 53 public class LLSDAssetUploadResponse
34 { 54 {
35 public string uploader = String.Empty; 55 public string uploader = String.Empty;
36 public string state = String.Empty; 56 public string state = String.Empty;
37 57 public int upload_price = 0;
58 public LLSDAssetUploadResponseData data = null;
38 public LLSDAssetUploadResponse() 59 public LLSDAssetUploadResponse()
39 { 60 {
40 } 61 }