diff options
| author | Melanie | 2012-06-03 02:36:28 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-03 02:36:28 +0100 |
| commit | 728249ba49bd64cb9d5540fa3ed9bca06652d7d4 (patch) | |
| tree | 96f680719edca41e8703b714e17b1e755b0ff104 /OpenSim/Capabilities/LLSDInventoryItem.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Fix build break whree accidentally did inv.Folders rather than inv.Folders.Co... (diff) | |
| download | opensim-SC-728249ba49bd64cb9d5540fa3ed9bca06652d7d4.zip opensim-SC-728249ba49bd64cb9d5540fa3ed9bca06652d7d4.tar.gz opensim-SC-728249ba49bd64cb9d5540fa3ed9bca06652d7d4.tar.bz2 opensim-SC-728249ba49bd64cb9d5540fa3ed9bca06652d7d4.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Capabilities/LLSDInventoryItem.cs')
| -rw-r--r-- | OpenSim/Capabilities/LLSDInventoryItem.cs | 6 |
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] |