From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * 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. --- .../Capabilities/LLSDInventoryItem.cs | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs') 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 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Framework.Communications.Capabilities { [LLSDMap] public class LLSDInventoryItem { - public LLUUID parent_id; + public UUID parent_id; - public LLUUID asset_id; - public LLUUID item_id; + public UUID asset_id; + public UUID item_id; public LLSDPermissions permissions; public string type; public string inv_type; @@ -50,9 +50,9 @@ namespace OpenSim.Framework.Communications.Capabilities [LLSDMap] public class LLSDPermissions { - public LLUUID creator_id; - public LLUUID owner_id; - public LLUUID group_id; + public UUID creator_id; + public UUID owner_id; + public UUID group_id; public int base_mask; public int owner_mask; public int group_mask; @@ -77,8 +77,8 @@ namespace OpenSim.Framework.Communications.Capabilities [LLSDMap] public class LLSDFetchInventoryDescendents { - public LLUUID folder_id; - public LLUUID owner_id; + public UUID folder_id; + public UUID owner_id; public int sort_order; public bool fetch_folders; public bool fetch_items; @@ -87,11 +87,11 @@ namespace OpenSim.Framework.Communications.Capabilities [LLSDMap] public class LLSDInventoryFolderContents { - public LLUUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-" + public UUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-" public int descendents; - public LLUUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names + public UUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names public LLSDArray items = new LLSDArray(); - public LLUUID owner___id; // and of course we can't have field names with "-" in + public UUID owner___id; // and of course we can't have field names with "-" in public int version; } -} \ No newline at end of file +} -- cgit v1.1