diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
index d48ef42a92..af87a688c6 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
@@ -201,7 +201,7 @@ namespace OpenSim.Capabilities.Handlers
                     LLSDxmlEncode2.AddElem_agent_id(thiscoll.OwnerID, lastresponse);
                     LLSDxmlEncode2.AddElem_owner_id(thiscoll.OwnerID, lastresponse);
                     LLSDxmlEncode2.AddElem("descendents", thiscoll.Descendents, lastresponse);
-                    LLSDxmlEncode2.AddElem("version", thiscoll.Version, lastresponse);
+                    LLSDxmlEncode2.AddElem_version(thiscoll.Version, lastresponse);
 
                     if (thiscoll.Folders == null || thiscoll.Folders.Count == 0)
                         LLSDxmlEncode2.AddEmptyArray("categories", lastresponse);
@@ -212,11 +212,11 @@ namespace OpenSim.Capabilities.Handlers
                         {
                             LLSDxmlEncode2.AddMap(lastresponse);
 
-                            LLSDxmlEncode2.AddElem("category_id", invFolder.ID, lastresponse);
+                            LLSDxmlEncode2.AddElem_category_id(invFolder.ID, lastresponse);
                             LLSDxmlEncode2.AddElem_parent_id(invFolder.ParentID, lastresponse);
                             LLSDxmlEncode2.AddElem_name(invFolder.Name, lastresponse);
                             LLSDxmlEncode2.AddElem("type_default", invFolder.Type, lastresponse);
-                            LLSDxmlEncode2.AddElem("version", invFolder.Version, lastresponse);
+                            LLSDxmlEncode2.AddElem_version( invFolder.Version, lastresponse);
 
                             LLSDxmlEncode2.AddEndMap(lastresponse);
                         }
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 13d66ce9b5..c4ec174c48 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -416,13 +416,13 @@ namespace OpenSim.Framework
         {
             LLSDxmlEncode2.AddMap(lsl);
                 LLSDxmlEncode2.AddElem_parent_id(Folder, lsl);
-                LLSDxmlEncode2.AddElem("asset_id", AssetID, lsl);
-                LLSDxmlEncode2.AddElem("item_id", ID, lsl);
+                LLSDxmlEncode2.AddElem_asset_id( AssetID, lsl);
+                LLSDxmlEncode2.AddElem_item_id( ID, lsl);
 
                 LLSDxmlEncode2.AddMap("permissions",lsl);
-                    LLSDxmlEncode2.AddElem("creator_id", CreatorIdAsUuid, lsl);
-                    LLSDxmlEncode2.AddElem_owner_id( Owner, lsl);
-                    LLSDxmlEncode2.AddElem("group_id", GroupID, lsl);
+                    LLSDxmlEncode2.AddElem_creator_id(CreatorIdAsUuid, lsl);
+                    LLSDxmlEncode2.AddElem_owner_id(Owner, lsl);
+                    LLSDxmlEncode2.AddElem_group_id(GroupID, lsl);
                     LLSDxmlEncode2.AddElem("base_mask", (int)CurrentPermissions, lsl);
                     LLSDxmlEncode2.AddElem("owner_mask", (int)CurrentPermissions, lsl);
                     LLSDxmlEncode2.AddElem("group_mask", (int)GroupPermissions, lsl);
@@ -435,10 +435,7 @@ namespace OpenSim.Framework
                 LLSDxmlEncode2.AddElem("inv_type", InvType, lsl);
                 LLSDxmlEncode2.AddElem("flags", (int)(Flags & flagsMask), lsl);
 
-                LLSDxmlEncode2.AddMap("sale_info",lsl);
-                    LLSDxmlEncode2.AddElem("sale_price", SalePrice, lsl);
-                    LLSDxmlEncode2.AddElem("sale_type", SaleType, lsl);
-                LLSDxmlEncode2.AddEndMap(lsl);
+                LLSDxmlEncode2.AddElem_sale_info(SalePrice, SaleType, lsl);
 
                 LLSDxmlEncode2.AddElem_name(Name, lsl);
                 LLSDxmlEncode2.AddElem("desc", Description, lsl);
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 0e9c9883f9..a08276f632 100755
Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index 11ae24b9b8..f4183b8696 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 449fd462e4..ec1bdbe34e 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 58d1eb1cda..5151372dc7 100755
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ