aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/LLSDInventoryItem.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-02 04:57:10 +0100
committerJustin Clark-Casey (justincc)2012-06-02 04:57:10 +0100
commit01a2b0b289933febc95523de02275c9bd573b10e (patch)
tree3ad8193876370cf4db30738d97c0b01f123100a8 /OpenSim/Capabilities/LLSDInventoryItem.cs
parentInstead of updating sim stats root agent, child, objects and scripts accounts... (diff)
downloadopensim-SC_OLD-01a2b0b289933febc95523de02275c9bd573b10e.zip
opensim-SC_OLD-01a2b0b289933febc95523de02275c9bd573b10e.tar.gz
opensim-SC_OLD-01a2b0b289933febc95523de02275c9bd573b10e.tar.bz2
opensim-SC_OLD-01a2b0b289933febc95523de02275c9bd573b10e.tar.xz
Fix various issues with http inventory
1) The return messages were being wrongly populated with the names of asset, inventory and sale types when their corresponding integers should have been used instead. 2) Folders with links were including the linked items in the descendents figure, when only the links should be included. 3) Links and linked items in link folders were not being included in the return data, and not in the correct order. Now that these issues have been addressed, outfits and attachments appear to work consistently when HTTP inventory is enabled (as is now the default).
Diffstat (limited to 'OpenSim/Capabilities/LLSDInventoryItem.cs')
-rw-r--r--OpenSim/Capabilities/LLSDInventoryItem.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Capabilities/LLSDInventoryItem.cs b/OpenSim/Capabilities/LLSDInventoryItem.cs
index 426a6cb..958e807 100644
--- a/OpenSim/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Capabilities/LLSDInventoryItem.cs
@@ -37,8 +37,8 @@ namespace OpenSim.Framework.Capabilities
37 public UUID asset_id; 37 public UUID asset_id;
38 public UUID item_id; 38 public UUID item_id;
39 public LLSDPermissions permissions; 39 public LLSDPermissions permissions;
40 public string type; 40 public int type;
41 public string inv_type; 41 public int inv_type;
42 public int flags; 42 public int flags;
43 43
44 public LLSDSaleInfo sale_info; 44 public LLSDSaleInfo sale_info;
@@ -65,7 +65,7 @@ namespace OpenSim.Framework.Capabilities
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 int sale_type;
69 } 69 }
70 70
71 [OSDMap] 71 [OSDMap]