diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 10:46:13 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 10:46:13 +0300 |
commit | 86bf599e2895b60c04fb688b9ad118c83e075be3 (patch) | |
tree | d9226e59b4ab1d591b843ec5497417a2a4be6797 /indra/llinventory/llinventory.h | |
parent | 33dc262e9a07c01ed33fb3a28edef32439fc908e (diff) | |
parent | a0b0f207779d1c8c3354af0a41d05dc6b188a033 (diff) |
Merge commit 'a0b0f20777' into marchcat/c-develop
# Conflicts:
# indra/newview/llinventorybridge.cpp
Diffstat (limited to 'indra/llinventory/llinventory.h')
-rw-r--r-- | indra/llinventory/llinventory.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index e63f2deba7..2044b0102c 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 |