diff options
| author | James Cook <james@lindenlab.com> | 2009-12-18 12:32:01 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-18 12:32:01 -0800 |
| commit | efdfc74b21f5d6386cc03136c4d2a8dcf07f9958 (patch) | |
| tree | 620d86df1d2b2cc409109eace7888cb68e1dc921 /indra/newview/llinventoryfilter.cpp | |
| parent | eb501f3231aacb2fd97d8428bb2d25b818b26263 (diff) | |
| parent | c1b58587dfe4711383b1878d341527221d2c298f (diff) | |
Merge with viewer-2-0 again, to pick up avatar changes
Diffstat (limited to 'indra/newview/llinventoryfilter.cpp')
| -rw-r--r-- | indra/newview/llinventoryfilter.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 522edd0cb5..b4dcb566e4 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -218,6 +218,7 @@ std::string::size_type LLInventoryFilter::getStringMatchOffset() const BOOL LLInventoryFilter::isNotDefault() const { return mFilterOps.mFilterObjectTypes != mDefaultFilterOps.mFilterObjectTypes + || mFilterOps.mFilterTypes != FILTERTYPE_OBJECT || mFilterSubString.size() || mFilterOps.mPermissions != mDefaultFilterOps.mPermissions || mFilterOps.mMinDate != mDefaultFilterOps.mMinDate @@ -227,7 +228,8 @@ BOOL LLInventoryFilter::isNotDefault() const BOOL LLInventoryFilter::isActive() const { - return mFilterOps.mFilterObjectTypes != 0xffffffffffffffffULL + return mFilterOps.mFilterObjectTypes != 0xffffffffffffffffULL + || mFilterOps.mFilterTypes != FILTERTYPE_OBJECT || mFilterSubString.size() || mFilterOps.mPermissions != PERM_NONE || mFilterOps.mMinDate != time_min() |