diff options
Part 2 of fixing inventory for client 1.19.1 (RC), inventory items should now show up.
Most likely still some problems and most like needs some more work (and still a couple of things to finish off).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs index 2d1d441..784b41c 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs | |||
@@ -4,15 +4,15 @@ using System.Text; | |||
4 | using libsecondlife; | 4 | using libsecondlife; |
5 | 5 | ||
6 | namespace OpenSim.Region.Capabilities | 6 | namespace OpenSim.Region.Capabilities |
7 | { | 7 | { |
8 | [LLSDMap] | 8 | [LLSDMap] |
9 | public class LLSDInventoryItem | 9 | public class LLSDInventoryItem |
10 | { | 10 | { |
11 | public LLUUID parent_id; | 11 | public LLUUID parent_id; |
12 | 12 | ||
13 | public LLUUID asset_id; | 13 | public LLUUID asset_id; |
14 | public LLUUID item_id; | 14 | public LLUUID item_id; |
15 | 15 | public LLSDPermissions permissions; | |
16 | public string type; | 16 | public string type; |
17 | public string inv_type; | 17 | public string inv_type; |
18 | public int flags; | 18 | public int flags; |
@@ -45,19 +45,19 @@ namespace OpenSim.Region.Capabilities | |||
45 | public string sale_type; | 45 | public string sale_type; |
46 | } | 46 | } |
47 | 47 | ||
48 | /* [LLSDMap] | 48 | /* [LLSDMap] |
49 | public class LLSDFolderItem | 49 | public class LLSDFolderItem |
50 | { | 50 | { |
51 | public LLUUID folder_id; | 51 | public LLUUID folder_id; |
52 | public LLUUID parent_id; | 52 | public LLUUID parent_id; |
53 | public int type; | 53 | public int type; |
54 | public string name; | 54 | public string name; |
55 | }*/ | 55 | }*/ |
56 | 56 | ||
57 | [LLSDMap] | 57 | [LLSDMap] |
58 | public class LLSDInventoryDescendents | 58 | public class LLSDInventoryDescendents |
59 | { | 59 | { |
60 | public LLSDArray folders= new LLSDArray(); | 60 | public LLSDArray folders = new LLSDArray(); |
61 | } | 61 | } |
62 | 62 | ||
63 | [LLSDMap] | 63 | [LLSDMap] |
@@ -73,11 +73,11 @@ namespace OpenSim.Region.Capabilities | |||
73 | [LLSDMap] | 73 | [LLSDMap] |
74 | public class LLSDInventoryFolderContents | 74 | public class LLSDInventoryFolderContents |
75 | { | 75 | { |
76 | public LLUUID agent___id; | 76 | public LLUUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-" |
77 | public int descendents; | 77 | public int descendents; |
78 | public LLUUID folder___id; // the (three "_") "___" so the serialising knows to change this to a "-" | 78 | public LLUUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names |
79 | public LLSDArray items = new LLSDArray(); | 79 | public LLSDArray items = new LLSDArray(); |
80 | public LLUUID owner___id; | 80 | public LLUUID owner___id; // and of course we can't have field names with "-" in |
81 | public int version; | 81 | public int version; |
82 | } | 82 | } |
83 | } | 83 | } |