diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Capabilities/LLSDAssetUploadResponse.cs | |
parent | Add a build script. (diff) | |
download | opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to 'OpenSim/Capabilities/LLSDAssetUploadResponse.cs')
-rw-r--r-- | OpenSim/Capabilities/LLSDAssetUploadResponse.cs | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Capabilities/LLSDAssetUploadResponse.cs index 0d6f7f9..97491e3 100644 --- a/OpenSim/Capabilities/LLSDAssetUploadResponse.cs +++ b/OpenSim/Capabilities/LLSDAssetUploadResponse.cs | |||
@@ -26,20 +26,51 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenMetaverse; | ||
29 | 30 | ||
30 | namespace OpenSim.Framework.Capabilities | 31 | namespace OpenSim.Framework.Capabilities |
31 | { | 32 | { |
32 | [OSDMap] | 33 | [OSDMap] |
34 | public class LLSDAssetUploadError | ||
35 | { | ||
36 | public string message = String.Empty; | ||
37 | public UUID identifier = UUID.Zero; | ||
38 | } | ||
39 | |||
40 | [OSDMap] | ||
41 | public class LLSDAssetUploadResponsePricebrkDown | ||
42 | { | ||
43 | public int mesh_streaming; | ||
44 | public int mesh_physics; | ||
45 | public int mesh_instance; | ||
46 | public int texture; | ||
47 | public int model; | ||
48 | } | ||
49 | |||
50 | [OSDMap] | ||
51 | public class LLSDAssetUploadResponseData | ||
52 | { | ||
53 | public double resource_cost; | ||
54 | public double model_streaming_cost; | ||
55 | public double simulation_cost; | ||
56 | public double physics_cost; | ||
57 | public LLSDAssetUploadResponsePricebrkDown upload_price_breakdown = new LLSDAssetUploadResponsePricebrkDown(); | ||
58 | } | ||
59 | |||
60 | [OSDMap] | ||
33 | public class LLSDAssetUploadResponse | 61 | public class LLSDAssetUploadResponse |
34 | { | 62 | { |
35 | public string uploader = String.Empty; | 63 | public string uploader = String.Empty; |
36 | public string state = String.Empty; | 64 | public string state = String.Empty; |
37 | 65 | public int upload_price = 0; | |
66 | public LLSDAssetUploadResponseData data = null; | ||
67 | public LLSDAssetUploadError error = null; | ||
38 | public LLSDAssetUploadResponse() | 68 | public LLSDAssetUploadResponse() |
39 | { | 69 | { |
40 | } | 70 | } |
41 | } | 71 | } |
42 | 72 | ||
73 | |||
43 | [OSDMap] | 74 | [OSDMap] |
44 | public class LLSDNewFileAngentInventoryVariablePriceReplyResponse | 75 | public class LLSDNewFileAngentInventoryVariablePriceReplyResponse |
45 | { | 76 | { |
@@ -47,7 +78,7 @@ namespace OpenSim.Framework.Capabilities | |||
47 | public string state; | 78 | public string state; |
48 | public int upload_price; | 79 | public int upload_price; |
49 | public string rsvp; | 80 | public string rsvp; |
50 | 81 | ||
51 | public LLSDNewFileAngentInventoryVariablePriceReplyResponse() | 82 | public LLSDNewFileAngentInventoryVariablePriceReplyResponse() |
52 | { | 83 | { |
53 | state = "confirm_upload"; | 84 | state = "confirm_upload"; |