aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llinventory/llinventory.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-07 23:35:25 -0600
committerJacek Antonelli2008-12-08 00:42:40 -0600
commit131cc1d821fafde3aa20bba66f387e092adf6f59 (patch)
tree7134419d9f3b14df386097d449a9925c6b78f3cb /linden/indra/llinventory/llinventory.cpp
parentNew enumerator for inventory types. (diff)
downloadmeta-impy-131cc1d821fafde3aa20bba66f387e092adf6f59.zip
meta-impy-131cc1d821fafde3aa20bba66f387e092adf6f59.tar.gz
meta-impy-131cc1d821fafde3aa20bba66f387e092adf6f59.tar.bz2
meta-impy-131cc1d821fafde3aa20bba66f387e092adf6f59.tar.xz
Added LLInventoryItem::mNInventoryType (new type) field.
Will always by NIT_NONE so far.
Diffstat (limited to 'linden/indra/llinventory/llinventory.cpp')
-rw-r--r--linden/indra/llinventory/llinventory.cpp13
1 files changed, 13 insertions, 0 deletions
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(
287 mDescription(desc), 287 mDescription(desc),
288 mSaleInfo(sale_info), 288 mSaleInfo(sale_info),
289 mInventoryType(inv_type), 289 mInventoryType(inv_type),
290 mNInventoryType(LLInventoryType::NIT_NONE),
290 mFlags(flags), 291 mFlags(flags),
291 mCreationDate(creation_date_utc) 292 mCreationDate(creation_date_utc)
292{ 293{
@@ -301,6 +302,7 @@ LLInventoryItem::LLInventoryItem() :
301 mDescription(), 302 mDescription(),
302 mSaleInfo(), 303 mSaleInfo(),
303 mInventoryType(LLInventoryType::IT_NONE), 304 mInventoryType(LLInventoryType::IT_NONE),
305 mNInventoryType(LLInventoryType::NIT_NONE),
304 mFlags(0), 306 mFlags(0),
305 mCreationDate(0) 307 mCreationDate(0)
306{ 308{
@@ -325,6 +327,7 @@ void LLInventoryItem::copyItem(const LLInventoryItem* other)
325 mDescription = other->mDescription; 327 mDescription = other->mDescription;
326 mSaleInfo = other->mSaleInfo; 328 mSaleInfo = other->mSaleInfo;
327 mInventoryType = other->mInventoryType; 329 mInventoryType = other->mInventoryType;
330 mNInventoryType = other->mNInventoryType;
328 mFlags = other->mFlags; 331 mFlags = other->mFlags;
329 mCreationDate = other->mCreationDate; 332 mCreationDate = other->mCreationDate;
330} 333}
@@ -417,6 +420,11 @@ void LLInventoryItem::setInventoryType(LLInventoryType::EType inv_type)
417 mInventoryType = inv_type; 420 mInventoryType = inv_type;
418} 421}
419 422
423void LLInventoryItem::setNInventoryType(LLInventoryType::NType inv_type)
424{
425 mNInventoryType = inv_type;
426}
427
420void LLInventoryItem::setFlags(U32 flags) 428void LLInventoryItem::setFlags(U32 flags)
421{ 429{
422 mFlags = flags; 430 mFlags = flags;
@@ -443,6 +451,11 @@ LLInventoryType::EType LLInventoryItem::getInventoryType() const
443 return mInventoryType; 451 return mInventoryType;
444} 452}
445 453
454LLInventoryType::NType LLInventoryItem::getNInventoryType() const
455{
456 return mNInventoryType;
457}
458
446U32 LLInventoryItem::getFlags() const 459U32 LLInventoryItem::getFlags() const
447{ 460{
448 return mFlags; 461 return mFlags;