diff options
| author | James Cook <james@lindenlab.com> | 2009-12-07 13:39:12 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-07 13:39:12 -0800 |
| commit | 13c998c34ac2c1f134b4c6998413753f94e1a002 (patch) | |
| tree | 9862c8bea90f6c4d6a74e2bfee287cd078232485 /indra/newview/llfolderview.cpp | |
| parent | f22d9cfdae437ddd21491fc7d6a59668203bd172 (diff) | |
| parent | aa2cdcfeef7a2259251abcfc11ab5d1107af2ea3 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 6a3462f201..4e77b42187 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -2208,9 +2208,9 @@ void LLFolderView::setFilterPermMask( PermissionMask filter_perm_mask ) mFilter->setFilterPermissions(filter_perm_mask); } -U32 LLFolderView::getFilterTypes() const +U32 LLFolderView::getFilterObjectTypes() const { - return mFilter->getFilterTypes(); + return mFilter->getFilterObjectTypes(); } PermissionMask LLFolderView::getFilterPermissions() const |