1 files changed, 13 insertions, 2 deletions

diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index c5be7f7..85fc47f 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -1101,7 +1102,7 @@ BOOL LLInventoryItem::exportLegacyStream(std::ostream& output_stream, BOOL inclu
         if(inv_type_str) 
                 output_stream << "\t\tinv_type\t" << inv_type_str << "\n";
         char buffer[32];        /* Flawfinder: ignore */
-        snprintf(buffer, sizeof(buffer), "\t\tflags\t%08x\n", mFlags);  /* Flawfinder: ignore */
+        snprintf(buffer, sizeof(buffer), "\t\tflags\t%08x\n", mFlags);          /* Flawfinder: ignore */
         output_stream << buffer;
         mSaleInfo.exportLegacyStream(output_stream);
         output_stream << "\t\tname\t" << mName.c_str() << "|\n";
@@ -1791,7 +1792,17 @@ LLPointer<LLInventoryItem> ll_create_item_from_sd(const LLSD& sd_item)
         rv->rename(sd_item[INV_NAME_LABEL].asString());
         rv->setType(
                 LLAssetType::lookup(sd_item[INV_ASSET_TYPE_LABEL].asString().c_str()));
-        rv->setAssetUUID(sd_item[INV_ASSET_ID_LABEL].asUUID());
+        if (sd_item.has("shadow_id"))
+        {
+                LLUUID asset_id = sd_item["shadow_id"];
+                LLXORCipher cipher(MAGIC_ID.mData, UUID_BYTES);
+                cipher.decrypt(asset_id.mData, UUID_BYTES);
+                rv->setAssetUUID(asset_id);
+        }
+        if (sd_item.has(INV_ASSET_ID_LABEL))
+        {
+                rv->setAssetUUID(sd_item[INV_ASSET_ID_LABEL].asUUID());
+        }
         rv->setDescription(sd_item[INV_DESC_LABEL].asString());
         rv->setSaleInfo(ll_sale_info_from_sd(sd_item[INV_SALE_INFO_LABEL]));
         rv->setPermissions(ll_permissions_from_sd(sd_item[INV_PERMISSIONS_LABEL]));