diff options
author | Jacek Antonelli | 2009-01-14 18:56:40 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-01-14 20:35:31 -0600 |
commit | f15ad1cb3c92b56ceaa647114974afe9252d6a1f (patch) | |
tree | 85553fd395ed8e4ae98b67c9c3e25b795b03030d /linden/indra | |
parent | Merge branch '1.1.0a-gstreamer' into next (diff) | |
download | meta-impy-f15ad1cb3c92b56ceaa647114974afe9252d6a1f.zip meta-impy-f15ad1cb3c92b56ceaa647114974afe9252d6a1f.tar.gz meta-impy-f15ad1cb3c92b56ceaa647114974afe9252d6a1f.tar.bz2 meta-impy-f15ad1cb3c92b56ceaa647114974afe9252d6a1f.tar.xz |
Added inventory ntype for folders.
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/llinventory/llinventory.cpp | 5 | ||||
-rw-r--r-- | linden/indra/llinventory/llinventorytype.h | 5 |
2 files changed, 9 insertions, 1 deletions
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( | |||
173 | case LLInventoryType::IT_ATTACHMENT: | 173 | case LLInventoryType::IT_ATTACHMENT: |
174 | return LLInventoryType::NIT_OBJECT; | 174 | return LLInventoryType::NIT_OBJECT; |
175 | 175 | ||
176 | // FOLDERS | ||
177 | case LLInventoryType::IT_CATEGORY: | ||
178 | case LLInventoryType::IT_ROOT_CATEGORY: | ||
179 | return LLInventoryType::NIT_FOLDER; | ||
180 | |||
176 | // UNKNOWN TYPE! | 181 | // UNKNOWN TYPE! |
177 | default: | 182 | default: |
178 | return LLInventoryType::NIT_NONE; | 183 | 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: | |||
152 | /* Objects */ | 152 | /* Objects */ |
153 | NIT_OBJECT = 1 << 24, | 153 | NIT_OBJECT = 1 << 24, |
154 | 154 | ||
155 | /* Folders ("Categories" in the old type system) */ | ||
156 | NIT_FOLDER = 1 << 25, | ||
157 | |||
155 | /* Bitwise OR-ing of all the above */ | 158 | /* Bitwise OR-ing of all the above */ |
156 | NIT_ALL = 0x1ffffff, | 159 | NIT_ALL = 0x3ffffff, |
157 | }; | 160 | }; |
158 | 161 | ||
159 | 162 | ||