Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559

3 files changed, 186 insertions, 156 deletions

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 81261f0767..5adf1fa0e6 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -40,9 +40,12 @@
 ///----------------------------------------------------------------------------
 /// Exported functions
 ///----------------------------------------------------------------------------
+// FIXME D567 - what's the point of these, especially if we don't even use them consistently?
 static const std::string INV_ITEM_ID_LABEL("item_id");
 static const std::string INV_FOLDER_ID_LABEL("cat_id");
 static const std::string INV_PARENT_ID_LABEL("parent_id");
+static const std::string INV_THUMBNAIL_LABEL("thumbnail");
+static const std::string INV_THUMBNAIL_ID_LABEL("thumbnail_id");
 static const std::string INV_ASSET_TYPE_LABEL("type");
 static const std::string INV_PREFERRED_TYPE_LABEL("preferred_type");
 static const std::string INV_INVENTORY_TYPE_LABEL("inv_type");
@@ -99,6 +102,7 @@ void LLInventoryObject::copyObject(const LLInventoryObject* other)
 	mParentUUID = other->mParentUUID;
 	mType = other->mType;
 	mName = other->mName;
+	mThumbnailUUID = other->mThumbnailUUID;
 }
 
 const LLUUID& LLInventoryObject::getUUID() const
@@ -111,6 +115,11 @@ const LLUUID& LLInventoryObject::getParentUUID() const
 	return mParentUUID;
 }
 
+const LLUUID& LLInventoryObject::getThumbnailUUID() const
+{
+	return mThumbnailUUID;
+}
+
 const std::string& LLInventoryObject::getName() const
 {
 	return mName;
@@ -160,6 +169,11 @@ void LLInventoryObject::setParent(const LLUUID& new_parent)
 	mParentUUID = new_parent;
 }
 
+void LLInventoryObject::setThumbnailUUID(const LLUUID& thumbnail_uuid)
+{
+	mThumbnailUUID = thumbnail_uuid;
+}
+
 void LLInventoryObject::setType(LLAssetType::EType type)
 {
 	mType = type;
@@ -201,6 +215,26 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
 		{
 			mType = LLAssetType::lookup(valuestr);
 		}
+        else if (0 == strcmp("metadata", keyword))
+        {
+            LLSD metadata(valuestr);
+            if (metadata.has("thumbnail"))
+            {
+                const LLSD& thumbnail = metadata["thumbnail"];
+                if (thumbnail.has("asset_id"))
+                {
+                    setThumbnailUUID(thumbnail["asset_id"].asUUID());
+                }
+                else
+                {
+                    setThumbnailUUID(LLUUID::null);
+                }
+            }
+            else
+            {
+                setThumbnailUUID(LLUUID::null);
+            }
+        }
 		else if(0 == strcmp("name", keyword))
 		{
 			//strcpy(valuestr, buffer + strlen(keyword) + 3);
@@ -336,6 +370,7 @@ void LLInventoryItem::copyItem(const LLInventoryItem* other)
 	copyObject(other);
 	mPermissions = other->mPermissions;
 	mAssetUUID = other->mAssetUUID;
+    mThumbnailUUID = other->mThumbnailUUID;
 	mDescription = other->mDescription;
 	mSaleInfo = other->mSaleInfo;
 	mInventoryType = other->mInventoryType;
@@ -400,6 +435,7 @@ U32 LLInventoryItem::getCRC32() const
 	//LL_DEBUGS() << "8 crc: " << std::hex << crc << std::dec << LL_ENDL;
 	crc += (U32)mCreationDate;
 	//LL_DEBUGS() << "9 crc: " << std::hex << crc << std::dec << LL_ENDL;
+    crc += mThumbnailUUID.getCRC32();
 	return crc;
 }
 
@@ -655,6 +691,26 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
 		{
 			mType = LLAssetType::lookup(valuestr);
 		}
+        else if (0 == strcmp("metadata", keyword))
+        {
+            LLSD metadata(valuestr);
+            if (metadata.has("thumbnail"))
+            {
+                const LLSD& thumbnail = metadata["thumbnail"];
+                if (thumbnail.has("asset_id"))
+                {
+                    setThumbnailUUID(thumbnail["asset_id"].asUUID());
+                }
+                else
+                {
+                    setThumbnailUUID(LLUUID::null);
+                }
+            }
+            else
+            {
+                setThumbnailUUID(LLUUID::null);
+            }
+        }
 		else if(0 == strcmp("inv_type", keyword))
 		{
 			mInventoryType = LLInventoryType::lookup(std::string(valuestr));
@@ -744,6 +800,13 @@ BOOL LLInventoryItem::exportLegacyStream(std::ostream& output_stream, BOOL inclu
 	output_stream << "\t\tparent_id\t" << uuid_str << "\n";
 	mPermissions.exportLegacyStream(output_stream);
 
+    if (mThumbnailUUID.notNull())
+    {
+        LLSD metadata;
+        metadata["thumbnail"] = LLSD().with("asset_id", mThumbnailUUID);
+        output_stream << "\t\tmetadata\t" << metadata << "|\n";
+    }
+
 	// Check for permissions to see the asset id, and if so write it
 	// out as an asset id. Otherwise, apply our cheesy encryption.
 	if(include_asset_key)
@@ -797,6 +860,11 @@ void LLInventoryItem::asLLSD( LLSD& sd ) const
 	sd[INV_PARENT_ID_LABEL] = mParentUUID;
 	sd[INV_PERMISSIONS_LABEL] = ll_create_sd_from_permissions(mPermissions);
 
+    if (mThumbnailUUID.notNull())
+    {
+        sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
+    }
+
 	U32 mask = mPermissions.getMaskBase();
 	if(((mask & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED)
 		|| (mAssetUUID.isNull()))
@@ -848,6 +916,35 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd, bool is_new)
 	{
 		mParentUUID = sd[w];
 	}
+    mThumbnailUUID.setNull();
+    w = INV_THUMBNAIL_LABEL;
+    if (sd.has(w))
+    {
+        const LLSD &thumbnail_map = sd[w];
+        w = INV_ASSET_ID_LABEL;
+        if (thumbnail_map.has(w))
+        {
+            mThumbnailUUID = thumbnail_map[w];
+        }
+        /* Example:
+            <key> asset_id </key>
+            <uuid> acc0ec86 - 17f2 - 4b92 - ab41 - 6718b1f755f7 </uuid>
+            <key> perms </key>
+            <integer> 8 </integer>
+            <key>service</key>
+            <integer> 3 </integer>
+            <key>version</key>
+            <integer> 1 </key>
+        */
+    }
+    else
+    {
+        w = INV_THUMBNAIL_ID_LABEL;
+        if (sd.has(w))
+        {
+            mThumbnailUUID = sd[w].asUUID();
+        }
+    }
 	w = INV_PERMISSIONS_LABEL;
 	if (sd.has(w))
 	{
@@ -972,135 +1069,6 @@ fail:
 
 }
 
-// Deleted LLInventoryItem::exportFileXML() and LLInventoryItem::importXML()
-// because I can't find any non-test code references to it. 2009-05-04 JC
-
-S32 LLInventoryItem::packBinaryBucket(U8* bin_bucket, LLPermissions* perm_override) const
-{
-	// Figure out which permissions to use.
-	LLPermissions perm;
-	if (perm_override)
-	{
-		// Use the permissions override.
-		perm = *perm_override;
-	}
-	else
-	{
-		// Use the current permissions.
-		perm = getPermissions();
-	}
-
-	// describe the inventory item
-	char* buffer = (char*) bin_bucket;
-	std::string creator_id_str;
-
-	perm.getCreator().toString(creator_id_str);
-	std::string owner_id_str;
-	perm.getOwner().toString(owner_id_str);
-	std::string last_owner_id_str;
-	perm.getLastOwner().toString(last_owner_id_str);
-	std::string group_id_str;
-	perm.getGroup().toString(group_id_str);
-	std::string asset_id_str;
-	getAssetUUID().toString(asset_id_str);
-	S32 size = sprintf(buffer,	/* Flawfinder: ignore */
-					   "%d|%d|%s|%s|%s|%s|%s|%x|%x|%x|%x|%x|%s|%s|%d|%d|%x",
-					   getType(),
-					   getInventoryType(),
-					   getName().c_str(),
-					   creator_id_str.c_str(),
-					   owner_id_str.c_str(),
-					   last_owner_id_str.c_str(),
-					   group_id_str.c_str(),
-					   perm.getMaskBase(),
-					   perm.getMaskOwner(),
-					   perm.getMaskGroup(),
-					   perm.getMaskEveryone(),
-					   perm.getMaskNextOwner(),
-					   asset_id_str.c_str(),
-					   getDescription().c_str(),
-					   getSaleInfo().getSaleType(),
-					   getSaleInfo().getSalePrice(),
-					   getFlags()) + 1;
-
-	return size;
-}
-
-void LLInventoryItem::unpackBinaryBucket(U8* bin_bucket, S32 bin_bucket_size)
-{	
-	// Early exit on an empty binary bucket.
-	if (bin_bucket_size <= 1) return;
-
-	if (NULL == bin_bucket)
-	{
-		LL_ERRS() << "unpackBinaryBucket failed.  bin_bucket is NULL." << LL_ENDL;
-		return;
-	}
-
-	// Convert the bin_bucket into a string.
-	std::vector<char> item_buffer(bin_bucket_size+1);
-	memcpy(&item_buffer[0], bin_bucket, bin_bucket_size);	/* Flawfinder: ignore */
-	item_buffer[bin_bucket_size] = '\0';
-	std::string str(&item_buffer[0]);
-
-	LL_DEBUGS() << "item buffer: " << str << LL_ENDL;
-
-	// Tokenize the string.
-	typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-	boost::char_separator<char> sep("|", "", boost::keep_empty_tokens);
-	tokenizer tokens(str, sep);
-	tokenizer::iterator iter = tokens.begin();
-
-	// Extract all values.
-	LLUUID item_id;
-	item_id.generate();
-	setUUID(item_id);
-
-	LLAssetType::EType type;
-	type = (LLAssetType::EType)(atoi((*(iter++)).c_str()));
-	setType( type );
-	
-	LLInventoryType::EType inv_type;
-	inv_type = (LLInventoryType::EType)(atoi((*(iter++)).c_str()));
-	setInventoryType( inv_type );
-
-	std::string name((*(iter++)).c_str());
-	rename( name );
-	
-	LLUUID creator_id((*(iter++)).c_str());
-	LLUUID owner_id((*(iter++)).c_str());
-	LLUUID last_owner_id((*(iter++)).c_str());
-	LLUUID group_id((*(iter++)).c_str());
-	PermissionMask mask_base = strtoul((*(iter++)).c_str(), NULL, 16);
-	PermissionMask mask_owner = strtoul((*(iter++)).c_str(), NULL, 16);
-	PermissionMask mask_group = strtoul((*(iter++)).c_str(), NULL, 16);
-	PermissionMask mask_every = strtoul((*(iter++)).c_str(), NULL, 16);
-	PermissionMask mask_next = strtoul((*(iter++)).c_str(), NULL, 16);
-	LLPermissions perm;
-	perm.init(creator_id, owner_id, last_owner_id, group_id);
-	perm.initMasks(mask_base, mask_owner, mask_group, mask_every, mask_next);
-	setPermissions(perm);
-	//LL_DEBUGS() << "perm: " << perm << LL_ENDL;
-
-	LLUUID asset_id((*(iter++)).c_str());
-	setAssetUUID(asset_id);
-
-	std::string desc((*(iter++)).c_str());
-	setDescription(desc);
-	
-	LLSaleInfo::EForSale sale_type;
-	sale_type = (LLSaleInfo::EForSale)(atoi((*(iter++)).c_str()));
-	S32 price = atoi((*(iter++)).c_str());
-	LLSaleInfo sale_info(sale_type, price);
-	setSaleInfo(sale_info);
-	
-	U32 flags = strtoul((*(iter++)).c_str(), NULL, 16);
-	setFlags(flags);
-
-	time_t now = time(NULL);
-	setCreationDate(now);
-}
-
 ///----------------------------------------------------------------------------
 /// Class LLInventoryCategory
 ///----------------------------------------------------------------------------
@@ -1150,11 +1118,32 @@ void LLInventoryCategory::setPreferredType(LLFolderType::EType type)
 LLSD LLInventoryCategory::asLLSD() const
 {
     LLSD sd = LLSD();
-    sd["item_id"] = mUUID;
-    sd["parent_id"] = mParentUUID;
+    sd[INV_ITEM_ID_LABEL]   = mUUID;
+    sd[INV_PARENT_ID_LABEL] = mParentUUID;
     S8 type = static_cast<S8>(mPreferredType);
-    sd["type"]      = type;
-    sd["name"] = mName;
+    sd[INV_ASSET_TYPE_LABEL] = type;
+    sd[INV_NAME_LABEL] = mName;
+
+    if (mThumbnailUUID.notNull())
+    {
+        sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
+    }
+
+    return sd;
+}
+
+LLSD LLInventoryCategory::asAISCreateCatLLSD() const
+{
+    LLSD sd                 = LLSD();
+    sd[INV_FOLDER_ID_LABEL_WS]  = mUUID;
+    sd[INV_PARENT_ID_LABEL] = mParentUUID;
+    S8 type                 = static_cast<S8>(mPreferredType);
+    sd[INV_ASSET_TYPE_LABEL_WS] = type;
+    sd[INV_NAME_LABEL] = mName;
+    if (mThumbnailUUID.notNull())
+    {
+        sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
+    }
 
     return sd;
 }
@@ -1184,6 +1173,25 @@ bool LLInventoryCategory::fromLLSD(const LLSD& sd)
     {
         mParentUUID = sd[w];
     }
+    mThumbnailUUID.setNull();
+    w = INV_THUMBNAIL_LABEL;
+    if (sd.has(w))
+    {
+        const LLSD &thumbnail_map = sd[w];
+        w = INV_ASSET_ID_LABEL;
+        if (thumbnail_map.has(w))
+        {
+            mThumbnailUUID = thumbnail_map[w];
+        }
+    }
+    else
+    {
+        w = INV_THUMBNAIL_ID_LABEL;
+        if (sd.has(w))
+        {
+            mThumbnailUUID = sd[w];
+        }
+    }
     w = INV_ASSET_TYPE_LABEL;
     if (sd.has(w))
     {
@@ -1275,6 +1283,26 @@ BOOL LLInventoryCategory::importLegacyStream(std::istream& input_stream)
 			LLStringUtil::replaceNonstandardASCII(mName, ' ');
 			LLStringUtil::replaceChar(mName, '|', ' ');
 		}
+        else if (0 == strcmp("metadata", keyword))
+        {
+            LLSD metadata(valuestr);
+            if (metadata.has("thumbnail"))
+            {
+                const LLSD& thumbnail = metadata["thumbnail"];
+                if (thumbnail.has("asset_id"))
+                {
+                    setThumbnailUUID(thumbnail["asset_id"].asUUID());
+                }
+                else
+                {
+                    setThumbnailUUID(LLUUID::null);
+                }
+            }
+            else
+            {
+                setThumbnailUUID(LLUUID::null);
+            }
+        }
 		else
 		{
 			LL_WARNS() << "unknown keyword '" << keyword
@@ -1295,6 +1323,12 @@ BOOL LLInventoryCategory::exportLegacyStream(std::ostream& output_stream, BOOL)
 	output_stream << "\t\ttype\t" << LLAssetType::lookup(mType) << "\n";
 	output_stream << "\t\tpref_type\t" << LLFolderType::lookup(mPreferredType) << "\n";
 	output_stream << "\t\tname\t" << mName.c_str() << "|\n";
+    if (mThumbnailUUID.notNull())
+    {
+        LLSD metadata;
+        metadata["thumbnail"] = LLSD().with("asset_id", mThumbnailUUID);
+        output_stream << "\t\tmetadata\t" << metadata << "|\n";
+    }
 	output_stream << "\t}\n";
 	return TRUE;
 }
@@ -1308,6 +1342,11 @@ LLSD LLInventoryCategory::exportLLSD() const
 	cat_data[INV_PREFERRED_TYPE_LABEL] = LLFolderType::lookup(mPreferredType);
 	cat_data[INV_NAME_LABEL] = mName;
 
+    if (mThumbnailUUID.notNull())
+    {
+        cat_data[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
+    }
+
 	return cat_data;
 }
 
@@ -1329,6 +1368,16 @@ bool LLInventoryCategory::importLLSD(const LLSD& cat_data)
 	{
 		setPreferredType(LLFolderType::lookup(cat_data[INV_PREFERRED_TYPE_LABEL].asString()));
 	}
+    if (cat_data.has(INV_THUMBNAIL_LABEL))
+    {
+        LLUUID thumbnail_uuid;
+        const LLSD &thumbnail_data = cat_data[INV_THUMBNAIL_LABEL];
+        if (thumbnail_data.has(INV_ASSET_ID_LABEL))
+        {
+            thumbnail_uuid = thumbnail_data[INV_ASSET_ID_LABEL].asUUID();
+        }
+        setThumbnailUUID(thumbnail_uuid);
+    }
 	if (cat_data.has(INV_NAME_LABEL))
 	{
 		mName = cat_data[INV_NAME_LABEL].asString();
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index 7d9f9704f1..6d4535af27 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -70,6 +70,7 @@ public:
 	virtual const LLUUID& getUUID() const; // inventoryID that this item points to
 	virtual const LLUUID& getLinkedUUID() const; // inventoryID that this item points to, else this item's inventoryID
 	const LLUUID& getParentUUID() const;
+	virtual const LLUUID& getThumbnailUUID() const;
 	virtual const std::string& getName() const;
 	virtual LLAssetType::EType getType() const;
 	LLAssetType::EType getActualType() const; // bypasses indirection for linked items
@@ -84,6 +85,7 @@ public:
 	void setUUID(const LLUUID& new_uuid);
 	virtual void rename(const std::string& new_name);
 	void setParent(const LLUUID& new_parent);
+	virtual void setThumbnailUUID(const LLUUID& thumbnail_uuid);
 	void setType(LLAssetType::EType type);
 	virtual void setCreationDate(time_t creation_date_utc); // only stored for items
 
@@ -108,6 +110,7 @@ public:
 protected:
 	LLUUID mUUID;
 	LLUUID mParentUUID; // Parent category.  Root categories have LLUUID::NULL.
+	LLUUID mThumbnailUUID;
 	LLAssetType::EType mType;
 	std::string mName;
 	time_t mCreationDate; // seconds from 1/1/1970, UTC
@@ -203,9 +206,6 @@ public:
 	// Helper Functions
 	//--------------------------------------------------------------------
 public:
-	// Pack all information needed to reconstruct this item into the given binary bucket.
-	S32 packBinaryBucket(U8* bin_bucket, LLPermissions* perm_override = NULL) const;
-	void unpackBinaryBucket(U8* bin_bucket, S32 bin_bucket_size);
 	LLSD asLLSD() const;
 	void asLLSD( LLSD& sd ) const;
 	bool fromLLSD(const LLSD& sd, bool is_new = true);
@@ -253,6 +253,7 @@ public:
 	LLFolderType::EType getPreferredType() const;
 	void setPreferredType(LLFolderType::EType type);
 	LLSD asLLSD() const;
+    LLSD asAISCreateCatLLSD() const;
 	bool fromLLSD(const LLSD& sd);
 
 	//--------------------------------------------------------------------
diff --git a/indra/llinventory/tests/inventorymisc_test.cpp b/indra/llinventory/tests/inventorymisc_test.cpp
index e8b063bffe..039fa938dd 100644
--- a/indra/llinventory/tests/inventorymisc_test.cpp
+++ b/indra/llinventory/tests/inventorymisc_test.cpp
@@ -400,27 +400,7 @@ namespace tut
 		// Deleted LLInventoryItem::exportFileXML() and LLInventoryItem::importXML()
 		// because I can't find any non-test code references to it. 2009-05-04 JC
 	}
-		
-	template<> template<>
-	void inventory_object::test<10>()
-	{
-		LLPointer<LLInventoryItem> src1 = create_random_inventory_item();
-		U8* bin_bucket = new U8[300];
-		S32 bin_bucket_size = src1->packBinaryBucket(bin_bucket, NULL);
-
-		LLPointer<LLInventoryItem> src2 = new LLInventoryItem();
-		src2->unpackBinaryBucket(bin_bucket, bin_bucket_size);
 
-		ensure_equals("1.sale price::getSalePrice() failed price", src1->getSaleInfo().getSalePrice(), src2->getSaleInfo().getSalePrice());
-		ensure_equals("2.sale type::getSaleType() failed type", src1->getSaleInfo().getSaleType(), src2->getSaleInfo().getSaleType());
-		ensure_equals("3.type::getType() failed", src1->getType(), src2->getType());
-		ensure_equals("4.inventory type::getInventoryType() failed type", src1->getInventoryType(), src2->getInventoryType());
-		ensure_equals("5.name::getName() failed", src1->getName(), src2->getName());
-		ensure_equals("6.description::getDescription() failed", src1->getDescription(), src2->getDescription());				
-		ensure_equals("7.flags::getFlags() failed", src1->getFlags(), src2->getFlags());
-	
-	}
-	
 	template<> template<>
 	void inventory_object::test<11>()
 	{