diff options
author | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
commit | f518ca7feb33c0c1641ccb8f3956246b855f9b6c (patch) | |
tree | 8dafdff97f14290b259bb04a03c5e7bb98756c24 /OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs | |
parent | Reverting the texture sending patch and the new libOMV. This makes this (diff) | |
download | opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.zip opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.gz opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.bz2 opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.xz |
Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new
libOMV.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs index ff36821..3651513 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs | |||
@@ -29,7 +29,7 @@ using OpenMetaverse; | |||
29 | 29 | ||
30 | namespace OpenSim.Framework.Communications.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDMap] | 32 | [OSDMap] |
33 | public class LLSDInventoryItem | 33 | public class LLSDInventoryItem |
34 | { | 34 | { |
35 | public UUID parent_id; | 35 | public UUID parent_id; |
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
47 | public int created_at; | 47 | public int created_at; |
48 | } | 48 | } |
49 | 49 | ||
50 | [LLSDMap] | 50 | [OSDMap] |
51 | public class LLSDPermissions | 51 | public class LLSDPermissions |
52 | { | 52 | { |
53 | public UUID creator_id; | 53 | public UUID creator_id; |
@@ -61,20 +61,20 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
61 | public bool is_owner_group; | 61 | public bool is_owner_group; |
62 | } | 62 | } |
63 | 63 | ||
64 | [LLSDMap] | 64 | [OSDMap] |
65 | public class LLSDSaleInfo | 65 | public class LLSDSaleInfo |
66 | { | 66 | { |
67 | public int sale_price; | 67 | public int sale_price; |
68 | public string sale_type; | 68 | public string sale_type; |
69 | } | 69 | } |
70 | 70 | ||
71 | [LLSDMap] | 71 | [OSDMap] |
72 | public class LLSDInventoryDescendents | 72 | public class LLSDInventoryDescendents |
73 | { | 73 | { |
74 | public LLSDArray folders = new LLSDArray(); | 74 | public OSDArray folders = new OSDArray(); |
75 | } | 75 | } |
76 | 76 | ||
77 | [LLSDMap] | 77 | [OSDMap] |
78 | public class LLSDFetchInventoryDescendents | 78 | public class LLSDFetchInventoryDescendents |
79 | { | 79 | { |
80 | public UUID folder_id; | 80 | public UUID folder_id; |
@@ -84,13 +84,13 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
84 | public bool fetch_items; | 84 | public bool fetch_items; |
85 | } | 85 | } |
86 | 86 | ||
87 | [LLSDMap] | 87 | [OSDMap] |
88 | public class LLSDInventoryFolderContents | 88 | public class LLSDInventoryFolderContents |
89 | { | 89 | { |
90 | public UUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-" | 90 | public UUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-" |
91 | public int descendents; | 91 | public int descendents; |
92 | public UUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names | 92 | public UUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names |
93 | public LLSDArray items = new LLSDArray(); | 93 | public OSDArray items = new OSDArray(); |
94 | public UUID owner___id; // and of course we can't have field names with "-" in | 94 | public UUID owner___id; // and of course we can't have field names with "-" in |
95 | public int version; | 95 | public int version; |
96 | } | 96 | } |