merged in jacek's fixes for inv icons

2 files changed, 9 insertions, 1 deletions

diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index e492889..4507d94 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -176,6 +176,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,
         };