From f15ad1cb3c92b56ceaa647114974afe9252d6a1f Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 14 Jan 2009 18:56:40 -0600 Subject: Added inventory ntype for folders. --- ChangeLog.txt | 8 ++++++++ linden/indra/llinventory/llinventory.cpp | 5 +++++ linden/indra/llinventory/llinventorytype.h | 5 ++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 4997658..2941998 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,11 @@ +2009-01-14 Jacek Antonelli + + * linden/indra/llinventory/llinventorytype.h: + Added inventory ntype for folders. + * linden/indra/llinventory/llinventory.cpp: + Ditto. + + 2009-01-11 Jacek Antonelli * linden/indra/cmake/GStreamer.cmake: diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp index 0a8a1fb..4b2e810 100644 --- a/linden/indra/llinventory/llinventory.cpp +++ b/linden/indra/llinventory/llinventory.cpp @@ -173,6 +173,11 @@ LLInventoryType::NType calc_ntype( case LLInventoryType::IT_ATTACHMENT: return LLInventoryType::NIT_OBJECT; + // FOLDERS + case LLInventoryType::IT_CATEGORY: + case LLInventoryType::IT_ROOT_CATEGORY: + return LLInventoryType::NIT_FOLDER; + // UNKNOWN TYPE! default: return LLInventoryType::NIT_NONE; diff --git a/linden/indra/llinventory/llinventorytype.h b/linden/indra/llinventory/llinventorytype.h index f228cd0..c81733e 100644 --- a/linden/indra/llinventory/llinventorytype.h +++ b/linden/indra/llinventory/llinventorytype.h @@ -152,8 +152,11 @@ public: /* Objects */ NIT_OBJECT = 1 << 24, + /* Folders ("Categories" in the old type system) */ + NIT_FOLDER = 1 << 25, + /* Bitwise OR-ing of all the above */ - NIT_ALL = 0x1ffffff, + NIT_ALL = 0x3ffffff, }; -- cgit v1.1