3 files changed, 59 insertions, 9 deletions

diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index 457a0cb..0c7e0ed 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -60,6 +60,9 @@ static const std::string INV_SALE_INFO_LABEL("sale_info");
 static const std::string INV_FLAGS_LABEL("flags");
 static const std::string INV_CREATION_DATE_LABEL("created_at");
 
+// key used by agent-inventory-service
+static const std::string INV_ASSET_TYPE_LABEL_WS("type_default");
+static const std::string INV_FOLDER_ID_LABEL_WS("category_id");
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -949,11 +952,13 @@ LLSD LLInventoryItem::asLLSD() const
                 sd[INV_SHADOW_ID_LABEL] = shadow_id;
         }
         sd[INV_ASSET_TYPE_LABEL] = LLAssetType::lookup(mType);
+        sd[INV_INVENTORY_TYPE_LABEL] = mInventoryType;
         const char* inv_type_str = LLInventoryType::lookup(mInventoryType);
         if(inv_type_str)
         {
                 sd[INV_INVENTORY_TYPE_LABEL] = inv_type_str;
         }
+        //sd[INV_FLAGS_LABEL] = (S32)mFlags;
         sd[INV_FLAGS_LABEL] = ll_sd_from_U32(mFlags);
         sd[INV_SALE_INFO_LABEL] = mSaleInfo;
         sd[INV_NAME_LABEL] = mName;
@@ -1026,17 +1031,40 @@ bool LLInventoryItem::fromLLSD(LLSD& sd)
         w = INV_ASSET_TYPE_LABEL;
         if (sd.has(w))
         {
-                mType = LLAssetType::lookup(sd[w].asString());
+                if (sd[w].isString())
+                {
+                        mType = LLAssetType::lookup(sd[w].asString().c_str());
+                }
+                else if (sd[w].isInteger())
+                {
+                        S8 type = (U8)sd[w].asInteger();
+                        mType = static_cast<LLAssetType::EType>(type);
+                }
         }
         w = INV_INVENTORY_TYPE_LABEL;
         if (sd.has(w))
         {
-                mInventoryType = LLInventoryType::lookup(sd[w].asString());
+                if (sd[w].isString())
+                {
+                        mInventoryType = LLInventoryType::lookup(sd[w].asString().c_str());
+                }
+                else if (sd[w].isInteger())
+                {
+                        S8 type = (U8)sd[w].asInteger();
+                        mInventoryType = static_cast<LLInventoryType::EType>(type);
+                }
         }
         w = INV_FLAGS_LABEL;
         if (sd.has(w))
         {
-                mFlags = ll_U32_from_sd(sd[w]);
+                if (sd[w].isBinary())
+                {
+                        mFlags = ll_U32_from_sd(sd[w]);
+                }
+                else if(sd[w].isInteger())
+                {
+                        mFlags = sd[w].asInteger();
+                }
         }
         w = INV_NAME_LABEL;
         if (sd.has(w))
@@ -1394,7 +1422,7 @@ bool LLInventoryCategory::fromLLSD(LLSD& sd)
 {
     std::string w;
 
-    w = INV_ITEM_ID_LABEL;
+    w = INV_FOLDER_ID_LABEL_WS;
     if (sd.has(w))
     {
         mUUID = sd[w];
@@ -1410,6 +1438,13 @@ bool LLInventoryCategory::fromLLSD(LLSD& sd)
         S8 type = (U8)sd[w].asInteger();
         mPreferredType = static_cast<LLAssetType::EType>(type);
     }
+        w = INV_ASSET_TYPE_LABEL_WS;
+        if (sd.has(w))
+        {
+                S8 type = (U8)sd[w].asInteger();
+        mPreferredType = static_cast<LLAssetType::EType>(type);
+        }
+
     w = INV_NAME_LABEL;
     if (sd.has(w))
     {
diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index 2b9c201..911e257 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -1398,7 +1398,7 @@ void LLParcel::unpackMessage(LLMessageSystem* msg)
 
         // New Media Data
         // Note: the message has been converted to TCP
-        if(msg->getNumberOfBlocks("MediaData") > 0)
+        if(msg->has("MediaData"))
         {
                 msg->getString("MediaData", "MediaDesc", buffer);
                 setMediaDesc(buffer);
@@ -1761,7 +1761,11 @@ void LLParcel::startSale(const LLUUID& buyer_id, BOOL is_buyer_group)
         setCleanOtherTime(0);
 }
 
-void LLParcel::expireSale(U32& type, U8& flags, LLUUID& from_id, LLUUID& to_id)
+void LLParcel::expireSale(
+        U32& type,
+        U8& flags,
+        LLUUID& from_id,
+        LLUUID& to_id)
 {
     mSaleTimerExpires.setTimerExpirySec(0.0);
     mSaleTimerExpires.stop();
@@ -1777,8 +1781,10 @@ void LLParcel::expireSale(U32& type, U8& flags, LLUUID& from_id, LLUUID& to_id)
     to_id.setNull();
 }
 
-void LLParcel::completeSale(U32& type, U8& flags,
-                            LLUUID& to_id)
+void LLParcel::completeSale(
+        U32& type,
+        U8& flags,
+        LLUUID& to_id)
 {
         mSaleTimerExpires.setTimerExpirySec(0.0);
         mSaleTimerExpires.stop();
diff --git a/linden/indra/llinventory/llsaleinfo.cpp b/linden/indra/llinventory/llsaleinfo.cpp
index 4895378..fef6b05 100644
--- a/linden/indra/llinventory/llsaleinfo.cpp
+++ b/linden/indra/llinventory/llsaleinfo.cpp
@@ -114,7 +114,16 @@ bool LLSaleInfo::fromLLSD(LLSD& sd, BOOL& has_perm_mask, U32& perm_mask)
 {
         const char *w;
 
-        mSaleType = lookup(sd["sale_type"].asString().c_str());
+        if (sd["sale_type"].isString())
+        {
+                mSaleType = lookup(sd["sale_type"].asString().c_str());
+        }
+        else if(sd["sale_type"].isInteger())
+        {
+                S8 type = (U8)sd["sale_type"].asInteger();
+                mSaleType = static_cast<LLSaleInfo::EForSale>(type);
+        }
+
         mSalePrice = llclamp(sd["sale_price"].asInteger(), 0, S32_MAX);
         w = "perm_mask";
         if (sd.has(w))