From e30228615d3a1c8ff3a6cb4a2fff4fd02b61c182 Mon Sep 17 00:00:00 2001 From: dolphin Date: Thu, 5 Jun 2014 10:55:32 -0700 Subject: ACME-1505: Filter the search lists to prevent experiences that don't make sense from appearing. --- indra/newview/llfloaterland.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 2406b2e3cd..8d2d29ace1 100755 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -76,6 +76,8 @@ #include "roles_constants.h" #include "lltrans.h" #include "llpanelexperiencelisteditor.h" +#include "llpanelexperiencepicker.h" +#include "llexperiencecache.h" #include "llgroupactions.h" @@ -2953,6 +2955,14 @@ BOOL LLPanelLandExperiences::postBuild() mAllowed = setupList("panel_allowed", EXPERIENCE_KEY_TYPE_ALLOWED, AL_ALLOW_EXPERIENCE); mBlocked = setupList("panel_blocked", EXPERIENCE_KEY_TYPE_BLOCKED, AL_BLOCK_EXPERIENCE); + // only non-grid-wide experiences + mAllowed->addFilter(boost::bind(LLPanelExperiencePicker::FilterWithProperty, _1, LLExperienceCache::PROPERTY_GRID)); + + // only grid-wide experiences + mBlocked->addFilter(boost::bind(LLPanelExperiencePicker::FilterWithoutProperty, _1, LLExperienceCache::PROPERTY_GRID)); + // but not privileged ones + mBlocked->addFilter(boost::bind(LLPanelExperiencePicker::FilterWithProperty, _1, LLExperienceCache::PROPERTY_PRIVILEGED)); + getChild("trusted_layout_panel")->setVisible(FALSE); getChild("experiences_help_text")->setVisible(FALSE); getChild("allowed_text_help")->setText(getString("allowed_parcel_text")); -- cgit v1.2.3