From 131cc1d821fafde3aa20bba66f387e092adf6f59 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 7 Dec 2008 23:35:25 -0600 Subject: Added LLInventoryItem::mNInventoryType (new type) field. Will always by NIT_NONE so far. --- linden/indra/llinventory/llinventory.cpp | 13 +++++++++++++ linden/indra/llinventory/llinventory.h | 3 +++ 2 files changed, 16 insertions(+) (limited to 'linden') diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp index 457a0cb..72eab74 100644 --- a/linden/indra/llinventory/llinventory.cpp +++ b/linden/indra/llinventory/llinventory.cpp @@ -287,6 +287,7 @@ LLInventoryItem::LLInventoryItem( mDescription(desc), mSaleInfo(sale_info), mInventoryType(inv_type), + mNInventoryType(LLInventoryType::NIT_NONE), mFlags(flags), mCreationDate(creation_date_utc) { @@ -301,6 +302,7 @@ LLInventoryItem::LLInventoryItem() : mDescription(), mSaleInfo(), mInventoryType(LLInventoryType::IT_NONE), + mNInventoryType(LLInventoryType::NIT_NONE), mFlags(0), mCreationDate(0) { @@ -325,6 +327,7 @@ void LLInventoryItem::copyItem(const LLInventoryItem* other) mDescription = other->mDescription; mSaleInfo = other->mSaleInfo; mInventoryType = other->mInventoryType; + mNInventoryType = other->mNInventoryType; mFlags = other->mFlags; mCreationDate = other->mCreationDate; } @@ -417,6 +420,11 @@ void LLInventoryItem::setInventoryType(LLInventoryType::EType inv_type) mInventoryType = inv_type; } +void LLInventoryItem::setNInventoryType(LLInventoryType::NType inv_type) +{ + mNInventoryType = inv_type; +} + void LLInventoryItem::setFlags(U32 flags) { mFlags = flags; @@ -443,6 +451,11 @@ LLInventoryType::EType LLInventoryItem::getInventoryType() const return mInventoryType; } +LLInventoryType::NType LLInventoryItem::getNInventoryType() const +{ + return mNInventoryType; +} + U32 LLInventoryItem::getFlags() const { return mFlags; diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h index d3cce6b..ac4e470 100644 --- a/linden/indra/llinventory/llinventory.h +++ b/linden/indra/llinventory/llinventory.h @@ -131,6 +131,7 @@ protected: std::string mDescription; LLSaleInfo mSaleInfo; LLInventoryType::EType mInventoryType; + LLInventoryType::NType mNInventoryType; U32 mFlags; time_t mCreationDate; // seconds from 1/1/1970, UTC @@ -236,6 +237,7 @@ public: const std::string& getDescription() const; const LLSaleInfo& getSaleInfo() const; LLInventoryType::EType getInventoryType() const; + LLInventoryType::NType getNInventoryType() const; U32 getFlags() const; time_t getCreationDate() const; U32 getCRC32() const; // really more of a checksum. @@ -247,6 +249,7 @@ public: void setSaleInfo(const LLSaleInfo& sale_info); void setPermissions(const LLPermissions& perm); void setInventoryType(LLInventoryType::EType inv_type); + void setNInventoryType(LLInventoryType::NType inv_type); void setFlags(U32 flags); void setCreationDate(time_t creation_date_utc); -- cgit v1.1