diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Capabilities/LLSDAssetUploadRequest.cs | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Capabilities/LLSDAssetUploadRequest.cs')
-rw-r--r-- | OpenSim/Capabilities/LLSDAssetUploadRequest.cs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Capabilities/LLSDAssetUploadRequest.cs index 6e66f0a..6779cc1 100644 --- a/OpenSim/Capabilities/LLSDAssetUploadRequest.cs +++ b/OpenSim/Capabilities/LLSDAssetUploadRequest.cs | |||
@@ -31,14 +31,27 @@ 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; |
37 | public string description = String.Empty; | 46 | public string description = String.Empty; |
38 | public UUID folder_id = UUID.Zero; | 47 | public UUID folder_id = UUID.Zero; |
48 | public UUID texture_folder_id = UUID.Zero; | ||
49 | public int next_owner_mask = 0; | ||
50 | public int group_mask = 0; | ||
51 | public int everyone_mask = 0; | ||
39 | public string inventory_type = String.Empty; | 52 | public string inventory_type = String.Empty; |
40 | public string name = String.Empty; | 53 | public string name = String.Empty; |
41 | 54 | public LLSDAssetResource asset_resources = new LLSDAssetResource(); | |
42 | public LLSDAssetUploadRequest() | 55 | public LLSDAssetUploadRequest() |
43 | { | 56 | { |
44 | } | 57 | } |