diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
| commit | 9db949eec327df4173fde3de934a87bedb0db13c (patch) | |
| tree | aeffa0f0e68b1d2ceb74d460cbbd22652c9cd159 /indra/llinventory/llinventory.h | |
| parent | 419e13d0acaabf5e1e02e9b64a07648bce822b2f (diff) | |
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
Diffstat (limited to 'indra/llinventory/llinventory.h')
| -rw-r--r-- | indra/llinventory/llinventory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 6a743e2bbd..6655d6f215 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -132,7 +132,7 @@ protected: LLSaleInfo mSaleInfo; LLInventoryType::EType mInventoryType; U32 mFlags; - S32 mCreationDate; // seconds from 1/1/1970, UTC + time_t mCreationDate; // seconds from 1/1/1970, UTC public: @@ -237,7 +237,7 @@ public: const LLSaleInfo& getSaleInfo() const; LLInventoryType::EType getInventoryType() const; U32 getFlags() const; - S32 getCreationDate() const; + time_t getCreationDate() const; U32 getCRC32() const; // really more of a checksum. // mutators - will not call updateServer(), and will never fail @@ -248,7 +248,7 @@ public: void setPermissions(const LLPermissions& perm); void setInventoryType(LLInventoryType::EType inv_type); void setFlags(U32 flags); - void setCreationDate(S32 creation_date_utc); + void setCreationDate(time_t creation_date_utc); // Put this inventory item onto the current outgoing mesage. It // assumes you have already called nextBlock(). |