viewer#1300 Inventory favorites basic framework

2 files changed, 77 insertions, 3 deletions

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 6334a35fd0..cef469e11e 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -46,6 +46,7 @@ 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_FAVORITE_LABEL("favorite");
 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");
@@ -82,14 +83,16 @@ LLInventoryObject::LLInventoryObject(const LLUUID& uuid,
 	mParentUUID(parent_uuid),
 	mType(type),
 	mName(name),
-	mCreationDate(0)
+	mCreationDate(0),
+    mFavorite(false)
 {
 	correctInventoryName(mName);
 }
 
 LLInventoryObject::LLInventoryObject() 
 :	mType(LLAssetType::AT_NONE),
-	mCreationDate(0)
+	mCreationDate(0),
+    mFavorite(false)
 {
 }
 
@@ -104,6 +107,7 @@ void LLInventoryObject::copyObject(const LLInventoryObject* other)
 	mType = other->mType;
 	mName = other->mName;
 	mThumbnailUUID = other->mThumbnailUUID;
+    mFavorite = other->mFavorite;
 }
 
 const LLUUID& LLInventoryObject::getUUID() const
@@ -121,6 +125,11 @@ const LLUUID& LLInventoryObject::getThumbnailUUID() const
 	return mThumbnailUUID;
 }
 
+bool LLInventoryObject::getIsFavorite() const
+{
+    return mFavorite;
+}
+
 const std::string& LLInventoryObject::getName() const
 {
 	return mName;
@@ -175,6 +184,11 @@ void LLInventoryObject::setThumbnailUUID(const LLUUID& thumbnail_uuid)
 	mThumbnailUUID = thumbnail_uuid;
 }
 
+void LLInventoryObject::setFavorite(bool favorite)
+{
+    mFavorite = favorite;
+}
+
 void LLInventoryObject::setType(LLAssetType::EType type)
 {
 	mType = type;
@@ -247,6 +261,14 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
             {
                 setThumbnailUUID(LLUUID::null);
             }
+            if (metadata.has("favorite"))
+            {
+                setFavorite(metadata["favorite"].asBoolean());
+            }
+            else
+            {
+                setFavorite(false);
+            }
         }
 		else if(0 == strcmp("name", keyword))
 		{
@@ -735,6 +757,14 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
             {
                 setThumbnailUUID(LLUUID::null);
             }
+            if (metadata.has("favorite"))
+            {
+                setFavorite(metadata["favorite"].asBoolean());
+            }
+            else
+            {
+                setFavorite(false);
+            }
         }
 		else if(0 == strcmp("inv_type", keyword))
 		{
@@ -895,6 +925,11 @@ void LLInventoryItem::asLLSD( LLSD& sd ) const
         sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
     }
 
+    if (mFavorite)
+    {
+        sd[INV_FAVORITE_LABEL] = mFavorite;
+    }
+
 	U32 mask = mPermissions.getMaskBase();
 	if(((mask & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED)
 		|| (mAssetUUID.isNull()))
@@ -974,7 +1009,7 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd, bool is_new)
                 <integer> 1 </key>
             */
           continue;
-      }
+        }
 
         if (i->first == INV_THUMBNAIL_ID_LABEL)
         {
@@ -982,6 +1017,12 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd, bool is_new)
             continue;
         }
 
+        if (i->first == INV_FAVORITE_LABEL)
+        {
+            mFavorite = i->second.asBoolean();
+            continue;
+        }
+
         if (i->first == INV_PERMISSIONS_LABEL)
         {
             mPermissions = ll_permissions_from_sd(i->second);
@@ -1177,6 +1218,11 @@ LLSD LLInventoryCategory::asLLSD() const
         sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
     }
 
+    if (mFavorite)
+    {
+        sd[INV_FAVORITE_LABEL] = mFavorite;
+    }
+
     return sd;
 }
 
@@ -1192,6 +1238,10 @@ LLSD LLInventoryCategory::asAISCreateCatLLSD() const
     {
         sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
     }
+    if (mFavorite)
+    {
+        sd[INV_FAVORITE_LABEL] = mFavorite;
+    }
 
     return sd;
 }
@@ -1240,6 +1290,11 @@ bool LLInventoryCategory::fromLLSD(const LLSD& sd)
             mThumbnailUUID = sd[w];
         }
     }
+    w = INV_FAVORITE_LABEL;
+    if (sd.has(w))
+    {
+        mFavorite = sd[w].asBoolean();
+    }
     w = INV_ASSET_TYPE_LABEL;
     if (sd.has(w))
     {
@@ -1362,6 +1417,14 @@ BOOL LLInventoryCategory::importLegacyStream(std::istream& input_stream)
             {
                 setThumbnailUUID(LLUUID::null);
             }
+            if (metadata.has("favorite"))
+            {
+                setFavorite(metadata["favorite"].asBoolean());
+            }
+            else
+            {
+                setFavorite(false);
+            }
         }
 		else
 		{
@@ -1409,6 +1472,10 @@ LLSD LLInventoryCategory::exportLLSD() const
     {
         cat_data[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
     }
+    if (mFavorite)
+    {
+        cat_data[INV_FAVORITE_LABEL] = mFavorite;
+    }
 
 	return cat_data;
 }
@@ -1441,6 +1508,10 @@ bool LLInventoryCategory::importLLSD(const LLSD& cat_data)
         }
         setThumbnailUUID(thumbnail_uuid);
     }
+    if (cat_data.has(INV_FAVORITE_LABEL))
+    {
+        setFavorite(cat_data[INV_FAVORITE_LABEL].asBoolean());
+    }
 	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 6d4535af27..27a05c1345 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -71,6 +71,7 @@ public:
 	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 bool getIsFavorite() const;
 	virtual const std::string& getName() const;
 	virtual LLAssetType::EType getType() const;
 	LLAssetType::EType getActualType() const; // bypasses indirection for linked items
@@ -86,6 +87,7 @@ public:
 	virtual void rename(const std::string& new_name);
 	void setParent(const LLUUID& new_parent);
 	virtual void setThumbnailUUID(const LLUUID& thumbnail_uuid);
+    virtual void setFavorite(bool favorite);
 	void setType(LLAssetType::EType type);
 	virtual void setCreationDate(time_t creation_date_utc); // only stored for items
 
@@ -111,6 +113,7 @@ protected:
 	LLUUID mUUID;
 	LLUUID mParentUUID; // Parent category.  Root categories have LLUUID::NULL.
 	LLUUID mThumbnailUUID;
+    bool mFavorite;
 	LLAssetType::EType mType;
 	std::string mName;
 	time_t mCreationDate; // seconds from 1/1/1970, UTC