diff options
author | Merov Linden <merov@lindenlab.com> | 2013-01-25 17:35:56 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-01-25 17:35:56 -0800 |
commit | 9b52a0d15a265c5bc3a9eaeea1eac00b0e25ad0b (patch) | |
tree | ccf87140822574c94014d57d29d902b25f37f574 /indra/newview/llinventorypanel.cpp | |
parent | 605511d6738817c7df3a85da873ef72c2471c642 (diff) |
MAINT-2287 : WIP : Make inbox and outbox visible and accessible if InventoryOutboxMakeVisible is set (default is false)
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r-- | indra/newview/llinventorypanel.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 05c81957c6..139f754e93 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -240,8 +240,11 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params) } // hide inbox - getFilter()->setFilterCategoryTypes(getFilter()->getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_INBOX)); - getFilter()->setFilterCategoryTypes(getFilter()->getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_OUTBOX)); + if (!gSavedSettings.getBOOL("InventoryOutboxMakeVisible")) + { + getFilter()->setFilterCategoryTypes(getFilter()->getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_INBOX)); + getFilter()->setFilterCategoryTypes(getFilter()->getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_OUTBOX)); + } // set the filter for the empty folder if the debug setting is on if (gSavedSettings.getBOOL("DebugHideEmptySystemFolders")) |