diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs index 1a75aba..ff36821 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs | |||
@@ -25,17 +25,17 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using libsecondlife; | 28 | using OpenMetaverse; |
29 | 29 | ||
30 | namespace OpenSim.Framework.Communications.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDMap] | 32 | [LLSDMap] |
33 | public class LLSDInventoryItem | 33 | public class LLSDInventoryItem |
34 | { | 34 | { |
35 | public LLUUID parent_id; | 35 | public UUID parent_id; |
36 | 36 | ||
37 | public LLUUID asset_id; | 37 | public UUID asset_id; |
38 | public LLUUID item_id; | 38 | public UUID item_id; |
39 | public LLSDPermissions permissions; | 39 | public LLSDPermissions permissions; |
40 | public string type; | 40 | public string type; |
41 | public string inv_type; | 41 | public string inv_type; |
@@ -50,9 +50,9 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
50 | [LLSDMap] | 50 | [LLSDMap] |
51 | public class LLSDPermissions | 51 | public class LLSDPermissions |
52 | { | 52 | { |
53 | public LLUUID creator_id; | 53 | public UUID creator_id; |
54 | public LLUUID owner_id; | 54 | public UUID owner_id; |
55 | public LLUUID group_id; | 55 | public UUID group_id; |
56 | public int base_mask; | 56 | public int base_mask; |
57 | public int owner_mask; | 57 | public int owner_mask; |
58 | public int group_mask; | 58 | public int group_mask; |
@@ -77,8 +77,8 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
77 | [LLSDMap] | 77 | [LLSDMap] |
78 | public class LLSDFetchInventoryDescendents | 78 | public class LLSDFetchInventoryDescendents |
79 | { | 79 | { |
80 | public LLUUID folder_id; | 80 | public UUID folder_id; |
81 | public LLUUID owner_id; | 81 | public UUID owner_id; |
82 | public int sort_order; | 82 | public int sort_order; |
83 | public bool fetch_folders; | 83 | public bool fetch_folders; |
84 | public bool fetch_items; | 84 | public bool fetch_items; |
@@ -87,11 +87,11 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
87 | [LLSDMap] | 87 | [LLSDMap] |
88 | public class LLSDInventoryFolderContents | 88 | public class LLSDInventoryFolderContents |
89 | { | 89 | { |
90 | public LLUUID 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 LLUUID 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 LLSDArray items = new LLSDArray(); |
94 | public LLUUID 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 | } |
97 | } \ No newline at end of file | 97 | } |