summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2018-05-29 11:49:46 -0400
committerOz Linden <oz@lindenlab.com>2018-05-29 11:49:46 -0400
commitc18a4cb0117b6e865a72a01465606c67a7e3bf6d (patch)
tree25abf867eabd03b7804a1e36e9c9af2513636cc7 /indra/newview/llinventorymodel.cpp
parent77344afa8b39b4c1fcebda4de63998a67fd4debb (diff)
parentc70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff)
merge changes for 5.1.4-release
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r--indra/newview/llinventorymodel.cpp21
1 files changed, 21 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 6a1ec9f991..556af93963 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -342,6 +342,27 @@ LLViewerInventoryCategory* LLInventoryModel::getCategory(const LLUUID& id) const
return category;
}
+bool LLInventoryModel::isCategoryHidden(const LLUUID& id) const
+{
+ bool res = false;
+ const LLViewerInventoryCategory* category = getCategory(id);
+ if (category)
+ {
+ LLFolderType::EType cat_type = category->getPreferredType();
+ switch (cat_type)
+ {
+ case LLFolderType::FT_INBOX:
+ case LLFolderType::FT_OUTBOX:
+ case LLFolderType::FT_MARKETPLACE_LISTINGS:
+ res = true;
+ break;
+ default:
+ break;
+ }
+ }
+ return res;
+}
+
S32 LLInventoryModel::getItemCount() const
{
return mItemMap.size();