diff options
author | prep <prep@lindenlab.com> | 2013-03-11 15:05:47 -0400 |
---|---|---|
committer | prep <prep@lindenlab.com> | 2013-03-11 15:05:47 -0400 |
commit | e0c9174609e2457fab7fe6d7291c6ebbd030397c (patch) | |
tree | a6f43767b2c3254e501c4ce0af628dfd159ad600 /indra/llinventory/llinventory.h | |
parent | 9514210beb1ae2ec49f1cf15e5a4f7af5ae56657 (diff) | |
parent | 207d9fd767895a3470722fb298eeef4f338e479a (diff) |
merge
Diffstat (limited to 'indra/llinventory/llinventory.h')
-rwxr-xr-x | indra/llinventory/llinventory.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index a88894da92..99716ed7be 100755 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -73,6 +73,7 @@ public: virtual LLAssetType::EType getType() const; LLAssetType::EType getActualType() const; // bypasses indirection for linked items BOOL getIsLinkType() const; + virtual time_t getCreationDate() const; //-------------------------------------------------------------------- // Mutators @@ -83,6 +84,7 @@ public: virtual void rename(const std::string& new_name); void setParent(const LLUUID& new_parent); void setType(LLAssetType::EType type); + virtual void setCreationDate(time_t creation_date_utc); // only stored for items private: // in place correction for inventory name string @@ -111,6 +113,7 @@ protected: LLUUID mParentUUID; // Parent category. Root categories have LLUUID::NULL. LLAssetType::EType mType; std::string mName; + time_t mCreationDate; // seconds from 1/1/1970, UTC }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -176,7 +179,6 @@ public: void setPermissions(const LLPermissions& perm); void setInventoryType(LLInventoryType::EType inv_type); void setFlags(U32 flags); - void setCreationDate(time_t creation_date_utc); void setCreator(const LLUUID& creator); // only used for calling cards // Check for changes in permissions masks and sale info @@ -222,7 +224,6 @@ protected: LLSaleInfo mSaleInfo; LLInventoryType::EType mInventoryType; U32 mFlags; - time_t mCreationDate; // seconds from 1/1/1970, UTC }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |