diff options
author | Jacek Antonelli | 2008-12-08 01:29:12 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-08 01:31:59 -0600 |
commit | 87c91cc283340c6b7fce90ac9f80826ba641a36f (patch) | |
tree | e229e12c6ef19b541a5d405dfa5f71c758b16962 | |
parent | Added calc_ntype() function. (diff) | |
download | meta-impy-87c91cc283340c6b7fce90ac9f80826ba641a36f.zip meta-impy-87c91cc283340c6b7fce90ac9f80826ba641a36f.tar.gz meta-impy-87c91cc283340c6b7fce90ac9f80826ba641a36f.tar.bz2 meta-impy-87c91cc283340c6b7fce90ac9f80826ba641a36f.tar.xz |
Added LLInventoryItem::recalcNInventoryType().
-rw-r--r-- | ChangeLog.txt | 6 | ||||
-rw-r--r-- | linden/indra/llinventory/llinventory.cpp | 6 | ||||
-rw-r--r-- | linden/indra/llinventory/llinventory.h | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 0036b77..6fd9698 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,6 +1,12 @@ | |||
1 | 2008-12-08 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2008-12-08 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/llinventory/llinventory.cpp: | 3 | * linden/indra/llinventory/llinventory.cpp: |
4 | Added LLInventoryItem::recalcNInventoryType(). | ||
5 | * linden/indra/llinventory/llinventory.h: | ||
6 | Ditto. | ||
7 | |||
8 | |||
9 | * linden/indra/llinventory/llinventory.cpp: | ||
4 | Added calc_ntype() function. | 10 | Added calc_ntype() function. |
5 | * linden/indra/llinventory/llinventory.h: | 11 | * linden/indra/llinventory/llinventory.h: |
6 | Ditto. | 12 | Ditto. |
diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp index 38cb37d..8d8008e 100644 --- a/linden/indra/llinventory/llinventory.cpp +++ b/linden/indra/llinventory/llinventory.cpp | |||
@@ -509,6 +509,12 @@ U32 LLInventoryItem::getCRC32() const | |||
509 | } | 509 | } |
510 | 510 | ||
511 | 511 | ||
512 | void LLInventoryItem::recalcNInventoryType() | ||
513 | { | ||
514 | setNInventoryType( calc_ntype(mInventoryType, mType, mFlags) ); | ||
515 | } | ||
516 | |||
517 | |||
512 | void LLInventoryItem::setDescription(const std::string& d) | 518 | void LLInventoryItem::setDescription(const std::string& d) |
513 | { | 519 | { |
514 | std::string new_desc(d); | 520 | std::string new_desc(d); |
diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h index 247e646..34d9445 100644 --- a/linden/indra/llinventory/llinventory.h +++ b/linden/indra/llinventory/llinventory.h | |||
@@ -285,6 +285,9 @@ public: | |||
285 | LLSD asLLSD() const; | 285 | LLSD asLLSD() const; |
286 | bool fromLLSD(LLSD& sd); | 286 | bool fromLLSD(LLSD& sd); |
287 | 287 | ||
288 | private: | ||
289 | void recalcNInventoryType(); | ||
290 | |||
288 | }; | 291 | }; |
289 | 292 | ||
290 | BOOL item_dictionary_sort(LLInventoryItem* a,LLInventoryItem* b); | 293 | BOOL item_dictionary_sort(LLInventoryItem* a,LLInventoryItem* b); |