diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-08-23 18:02:04 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-08-23 18:02:04 -0700 |
| commit | 27a6e55319017c93fbc8cd73e184019d120d6589 (patch) | |
| tree | 18400e2d08091afce3298275a580a516c52cfa63 /indra | |
| parent | c77575df2f91452ad1a527f2f46ba1191459b259 (diff) | |
DD-176 : Show marketplace listing root even if InventoryOutboxMakeVisible is false.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llinventorypanel.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index c0fdb80a42..4a25656090 100755 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -290,9 +290,13 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params) { getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_INBOX)); getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_OUTBOX)); - getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_MARKETPLACE_LISTINGS)); } - + // hide marketplace listing box, unless we want to show it (note: hacky as show_root_folder is only used for marketplace...) + if (!gSavedSettings.getBOOL("InventoryOutboxMakeVisible") && !mParams.show_root_folder) + { + getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_MARKETPLACE_LISTINGS)); + } + // set the filter for the empty folder if the debug setting is on if (gSavedSettings.getBOOL("DebugHideEmptySystemFolders")) { |