From f518ca7feb33c0c1641ccb8f3956246b855f9b6c Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 19 Nov 2008 06:25:34 +0000
Subject: Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the
 new libOMV.

---
 .../Communications/Capabilities/LLSDInventoryItem.cs     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 ff36821..3651513 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Framework.Communications.Capabilities
 {
-    [LLSDMap]
+    [OSDMap]
     public class LLSDInventoryItem
     {
         public UUID parent_id;
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Communications.Capabilities
         public int created_at;
     }
 
-    [LLSDMap]
+    [OSDMap]
     public class LLSDPermissions
     {
         public UUID creator_id;
@@ -61,20 +61,20 @@ namespace OpenSim.Framework.Communications.Capabilities
         public bool is_owner_group;
     }
 
-    [LLSDMap]
+    [OSDMap]
     public class LLSDSaleInfo
     {
         public int sale_price;
         public string sale_type;
     }
 
-    [LLSDMap]
+    [OSDMap]
     public class LLSDInventoryDescendents
     {
-        public LLSDArray folders = new LLSDArray();
+        public OSDArray folders = new OSDArray();
     }
 
-    [LLSDMap]
+    [OSDMap]
     public class LLSDFetchInventoryDescendents
     {
         public UUID folder_id;
@@ -84,13 +84,13 @@ namespace OpenSim.Framework.Communications.Capabilities
         public bool fetch_items;
     }
 
-    [LLSDMap]
+    [OSDMap]
     public class LLSDInventoryFolderContents
     {
         public UUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-"
         public int descendents;
         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 OSDArray items = new OSDArray();
         public UUID owner___id; // and of course we can't have field names with "-" in
         public int version;
     }
-- 
cgit v1.1