diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-09-05 15:14:21 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-09-05 15:14:21 -0700 |
| commit | 4e84aa4ecfe3351463ca9c54df4477528f65e41f (patch) | |
| tree | a3831ac1094c87312603f8904481d837ca6e246e /indra/newview | |
| parent | e7645eb995c291ebbbd05bab796639306545d2ad (diff) | |
Fixed reversed logic
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfloaterland.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelexperiencepicker.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llpanelexperiencepicker.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index bf6bf584d9..dc0747975b 100755 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -2959,7 +2959,7 @@ BOOL LLPanelLandExperiences::postBuild() mAllowed->addFilter(boost::bind(LLPanelExperiencePicker::FilterWithProperty, _1, LLExperienceCache::PROPERTY_GRID)); // no privileged ones - mBlocked->addFilter(boost::bind(LLPanelExperiencePicker::FilterWithProperties, _1, LLExperienceCache::PROPERTY_PRIVILEGED|LLExperienceCache::PROPERTY_GRID)); + mBlocked->addFilter(boost::bind(LLPanelExperiencePicker::FilterWithoutProperties, _1, LLExperienceCache::PROPERTY_PRIVILEGED|LLExperienceCache::PROPERTY_GRID)); getChild<LLLayoutPanel>("trusted_layout_panel")->setVisible(FALSE); getChild<LLTextBox>("experiences_help_text")->setVisible(FALSE); diff --git a/indra/newview/llpanelexperiencepicker.cpp b/indra/newview/llpanelexperiencepicker.cpp index e3fe3c3332..b7c0f3b1fb 100644 --- a/indra/newview/llpanelexperiencepicker.cpp +++ b/indra/newview/llpanelexperiencepicker.cpp @@ -407,9 +407,9 @@ bool LLPanelExperiencePicker::FilterWithProperty( const LLSD& experience, S32 pr return (experience[LLExperienceCache::PROPERTIES].asInteger() & prop) != 0; } -bool LLPanelExperiencePicker::FilterWithProperties( const LLSD& experience, S32 prop) +bool LLPanelExperiencePicker::FilterWithoutProperties( const LLSD& experience, S32 prop) { - return ! ((experience[LLExperienceCache::PROPERTIES].asInteger() & prop) == prop); + return ((experience[LLExperienceCache::PROPERTIES].asInteger() & prop) == prop); } bool LLPanelExperiencePicker::FilterWithoutProperty( const LLSD& experience, S32 prop ) diff --git a/indra/newview/llpanelexperiencepicker.h b/indra/newview/llpanelexperiencepicker.h index 2a0731f34c..e39ffed70b 100644 --- a/indra/newview/llpanelexperiencepicker.h +++ b/indra/newview/llpanelexperiencepicker.h @@ -55,7 +55,7 @@ public: void setDefaultFilters(); static bool FilterWithProperty(const LLSD& experience, S32 prop); - static bool FilterWithProperties(const LLSD& experience, S32 prop); + static bool FilterWithoutProperties(const LLSD& experience, S32 prop); static bool FilterWithoutProperty(const LLSD& experience, S32 prop); static bool FilterMatching(const LLSD& experience, const LLUUID& id); bool FilterOverRating(const LLSD& experience); |